Merge pull request #131 from charlieok/bump_versions

Bump versions

README.md

@@ -293,24 +293,24 @@ a command like `type python3` should tell you where it is installed on your syst
 % type python3
 python3 is /usr/bin/python3
 % /usr/bin/python3 --version
-Python 3.8.2
+Python 3.9.7
 ```
 
 We can use python's built-in `venv` module to create a virtual environment:
 
 ```
-zcash-gitian % /usr/bin/python3 -m venv ./local/python_v3.8.2_venv
+zcash-gitian % /usr/bin/python3 -m venv ./local/python_v3.9.7_venv
 ```
 
-Translation: "Create a virtual environment at ./local/python_v3.8.2_venv".
+Translation: "Create a virtual environment at ./local/python_v3.9.7_venv".
 
 The project subdirectory `local` is `.gitignored` to provide a convenient location for files we
 don't want to commit and track in version control.
 
-You should now have a tree of directories and files in `local/python_v3.8.2_venv`:
+You should now have a tree of directories and files in `local/python_v3.9.7_venv`:
 
 ```
-zcash-gitian % ls -F ./local/python_v3.8.2_venv
+zcash-gitian % ls -F ./local/python_v3.9.7_venv
 bin/		include/	lib/		pyvenv.cfg
 ```
 
@@ -318,9 +318,9 @@ Inside the `bin` directory, among other things, are the entries `python` and `py
 symlinks that point back to the `python3` executable we used to create this environment:
 
 ```
-zcash-gitian % ls -F ./local/python_v3.8.2_venv/bin/
-Activate.ps1		activate.csh		easy_install*		pip*			pip3.8*			python3@
-activate		activate.fish		easy_install-3.8*	pip3*			python@
+zcash-gitian % ls -F ./local/python_v3.9.7_venv/bin/
+Activate.ps1	activate.csh	pip*		pip3.9*		python3@
+activate	activate.fish	pip3*		python@		python3.9@
 ```
 
 A python virtual environment is 'active' if the python interpreter being executed is run from its
@@ -332,7 +332,7 @@ An `activate` script is provided, and you can use that, but if you're using `dir
 a simple automatic activation for the project directory by adding the following line to `.envrc`:
 
 ```
-load_prefix local/python_v3.8.2_venv
+load_prefix local/python_v3.9.7_venv
 ```
 
 The command `load_prefix` is provided by `direnv` to modify a whole set of common "path" variables
@@ -341,7 +341,7 @@ The command `load_prefix` is provided by `direnv` to modify a whole set of commo
 Let's add that line now:
 
 ```
-zcash-gitian$ echo "load_prefix local/python_v3.8.2_venv" >> .envrc
+zcash-gitian$ echo "load_prefix local/python_v3.9.7_venv" >> .envrc
 direnv: error .envrc is blocked. Run `direnv allow` to approve its content.
 zcash-gitian$ direnv allow
 direnv: loading .envrc
@@ -356,11 +356,11 @@ locations we default to:
 
 ```
 zcash-gitian$ echo $PATH
-/Users/harrypotter/Projects/zcash-gitian/local/python_v3.8.2_venv/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games
+/Users/harrypotter/Projects/zcash-gitian/local/python_v3.9.7_venv/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games
 zcash-gitian$ type python
-python is /Users/harrypotter/Projects/zcash-gitian/local/python_v3.8.2_venv/bin/python
+python is /Users/harrypotter/Projects/zcash-gitian/local/python_v3.9.7_venv/bin/python
 zcash-gitian$ type python3
-python3 is /Users/harrypotter/Projects/zcash-gitian/local/python_v3.8.2_venv/bin/python3
+python3 is /Users/harrypotter/Projects/zcash-gitian/local/python_v3.9.7_venv/bin/python3
 ```
 
 Since the `python` and `python3` commands will now run from the locations we've installed into our
@@ -375,10 +375,7 @@ environment active when using a shell at (or below) that location.
 
 ```
 zcash-gitian % pip3 install --upgrade pip
-Collecting pip
-[...]
-      Successfully uninstalled pip-19.2.3
-Successfully installed pip-21.0.1
+Requirement already satisfied: pip in ./local/python_v3.9.7_venv/lib/python3.9/site-packages (21.2.4)
 ```
 
 
@@ -397,7 +394,7 @@ Check that you can run `ansible` from the command line:
 
 ```
 zcash-gitian % ansible --version
-ansible 2.10.7
+ansible [core 2.11.5]
 [...]
 zcash-gitian %
 ```

Vagrantfile

@@ -11,7 +11,7 @@ Vagrant.configure(2) do |config|
   config.disksize.size = '24GB'
   config.vm.define 'zcash-build', autostart: false do |gitian|
     gitian.vm.box = "debian/buster64"
-    gitian.vm.box_version = "10.4.0"
+    gitian.vm.box_version = "10.20210829.1"
     gitian.vm.network "forwarded_port", guest: 22, host: 2200, auto_correct: true
     gitian.vm.provision "ansible" do |ansible|
       ansible.playbook = "gitian.yml"

dependency_install_steps_by_platform/macOS.md

@@ -2,13 +2,13 @@
 
 This document assumes you are starting from a fresh install of macOS.
 
-Most recently tested 2021-04-09 with the following macOS release:
+Most recently tested 2021-09-21 with the following macOS release:
 
 ```
 % sw_vers
 ProductName:	macOS
-ProductVersion:	11.2.3
-BuildVersion:	20D91
+ProductVersion:	11.5.2
+BuildVersion:	20G95
 ```
 
 
@@ -46,13 +46,13 @@ $ brew upgrade <formula name>
 
 Homebrew has a search page you can use to look up formula names: http://formulae.brew.sh/
 
-Most recently tested 2021-02-22 with the following Homebrew release:
+Most recently tested 2021-09-21 with the following Homebrew release:
 
 ```
 % brew --version
-Homebrew 3.0.11
-Homebrew/homebrew-core (git revision 5aa04149e9; last commit 2021-04-09)
-Homebrew/homebrew-cask (git revision 77095bcb6b; last commit 2021-04-09)
+Homebrew 3.2.13
+Homebrew/homebrew-core (git revision 9a917cc5fcd; last commit 2021-09-21)
+Homebrew/homebrew-cask (git revision 0892bc690f; last commit 2021-09-21)
 ```
 
 
@@ -66,26 +66,40 @@ that, the second attempt should succeed.
 $ brew install virtualbox
 ```
 
-Most recently tested 2021-04-09 with the following Virtualbox release:
+Most recently tested 2021-09-21 with the following Virtualbox release:
 
 ```
 % VBoxManage --version
-6.1.18r142142
+6.1.26r145957
 ```
 
 
 
 ## Install Vagrant
 
+As of 2021-09-21, the current vagrant version (2.2.18) conflicts with the most recent version of 
+vagrant-scp (0.5.7).
+
+Github issues for that version conflict:
+https://github.com/hashicorp/vagrant/issues/12504
+https://github.com/invernizzi/vagrant-scp/issues/46
+
+When that conflict is resolved, with a new release of vagrant or vagrant-scp or both, we should be
+able to `brew install vagrant` here. Until then, a workaround is to install vagrant 2.2.16:
+
 ```
+$ curl -O -L https://github.com/Homebrew/homebrew-cask/raw/015bd57c9637d517f1a814e46a1ece5de570c263/Casks/vagrant.rb
 $ brew install vagrant
+$ brew install --cask ./vagrant.rb
 ```
 
-Most recently tested 2021-04-09 with the following Vagrant release:
+(after the above steps the `vagrant.rb` file can be removed)
+
+Most recently tested 2021-09-21 with the following Vagrant release:
 
 ```
 % vagrant --version
-Vagrant 2.2.15
+Vagrant 2.2.16
 ```
 
 
@@ -96,12 +110,12 @@ Vagrant 2.2.15
 $ brew install gnupg
 ```
 
-Most recently tested 2021-04-09 with the following GnuPG release:
+Most recently tested 2021-09-21 with the following GnuPG release:
 
 ```
 % gpg --version
-gpg (GnuPG) 2.2.27
-libgcrypt 1.9.2
+gpg (GnuPG) 2.3.2
+libgcrypt 1.9.4
 [...]
 ```
 
@@ -119,11 +133,11 @@ $ brew install python
 Note that to run python 3.x you need to use the name `python3`; running `python` will run python
 2.x.
 
-Most recently tested 2021-02-22 with the following Python release:
+Most recently tested 2021-09-21 with the following Python release:
 
 ```
 % python3 --version
-Python 3.8.2
+Python 3.9.7
 ```
 
 
@@ -147,7 +161,7 @@ eval "$(direnv hook bash)"
 direnv also supports several other shells -- zsh, fish, tcsh, and elvish as of this writing. Its
 website includes instructions for enabling each of the shells it supports.
 
-Most recently tested 2021-04-09 with the following direnv release:
+Most recently tested 2021-09-21 with the following direnv release:
 
 ```
 % direnv --version

requirements-pip.lock

@@ -1,14 +1,16 @@
 # Primary Dependencies
 # (Packages we actually decided to include)
-ansible==3.2.0
+ansible==4.5.0
 # Secondary Dependencies
 # (pulled in by one or more of the above dependencies)
-ansible-base==2.10.7
-cffi==1.14.5
-cryptography==3.4.7
-Jinja2==2.11.3
-MarkupSafe==1.1.1
-packaging==20.9
+WARNING: Requirement file [./requirements-pip.lock] contains ansible-base==2.10.7, but package 'ansible-base' is not installed
+ansible-core==2.11.5
+cffi==1.14.6
+cryptography==3.4.8
+Jinja2==3.0.1
+MarkupSafe==2.0.1
+packaging==21.0
 pycparser==2.20
 pyparsing==2.4.7
 PyYAML==5.4.1
+resolvelib==0.5.4

roles/gitian/tasks/main.yml

@@ -32,7 +32,7 @@
 
 - name: Install ruamel.yaml
   pip:
-    name: "ruamel.yaml==0.16.11"
+    name: "ruamel.yaml>=0.15.0,<0.16.0"
 
 - name: Set up the Gitian build user with sudo.
   user: