Update dependencies and offline installer

Maduflavins · Apr 12, 2019 · 1b071e7 · 1b071e7
1 parent 4be4699
commit 1b071e7
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 58 deletions.
diff --git a/Makefile b/Makefile
@@ -41,13 +41,11 @@ help: ## Display this help message
 requirements: ## Install requirements
 	pip install -r requirements/base.txt
 
+upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade: ## Upgrade requirements with pip-tools
 	pip install -qr requirements/pip-tools.txt
 	pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
 	pip-compile --upgrade -o requirements/base.txt requirements/base.in
-	bash post-pip-compile.sh \
-		requirements/pip-tools.txt \
-		requirements/base.txt \
 
 dev.checkout: ## Check out "openedx-release/$OPENEDX_RELEASE" in each repo if set, "master" otherwise
 	./repo.sh checkout

diff --git a/post-pip-compile.sh b/post-pip-compile.sh
diff --git a/requirements/base.in b/requirements/base.in
@@ -1,2 +1,4 @@
-docker-compose>=1.9.0,<2.0.0
-functools32 ; python_version == "2.7" # via jsonschema
+-c constraints.txt
+
+docker-compose                      # For launching the devstack Docker containers
+PyYAML                              # For parsing configuration files while generating offline installers
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -4,23 +4,31 @@
 #
 #    make upgrade
 #
-backports.ssl-match-hostname==3.5.0.1  # via docker, docker-compose
-cached-property==1.4.2    # via docker-compose
-certifi==2018.4.16        # via requests
+asn1crypto==0.24.0        # via cryptography
+backports.ssl-match-hostname==3.7.0.1  # via docker, docker-compose
+bcrypt==3.1.6             # via paramiko
+cached-property==1.5.1    # via docker-compose
+certifi==2019.3.9         # via requests
+cffi==1.12.2              # via bcrypt, cryptography, pynacl
 chardet==3.0.4            # via requests
-docker-compose==1.21.2
-docker-pycreds==0.2.3     # via docker
-docker==3.3.0             # via docker-compose
+cryptography==2.6.1       # via paramiko
+docker-compose==1.24.0
+docker-pycreds==0.4.0     # via docker
+docker[ssh]==3.7.2        # via docker-compose
 dockerpty==0.4.1          # via docker-compose
 docopt==0.6.2             # via docker-compose
-enum34==1.1.6             # via docker-compose
-functools32==3.2.3.post2 ; python_version == "2.7"
-idna==2.6                 # via requests
-ipaddress==1.0.22         # via docker, docker-compose
+enum34==1.1.6             # via cryptography, docker-compose
+functools32==3.2.3.post2 ; python_version == "2.7"  # via jsonschema
+idna==2.7                 # via requests
+ipaddress==1.0.22         # via cryptography, docker, docker-compose
 jsonschema==2.6.0         # via docker-compose
-pyyaml==3.12              # via docker-compose
-requests==2.18.4          # via docker, docker-compose
-six==1.11.0               # via docker, docker-compose, docker-pycreds, dockerpty, websocket-client
+paramiko==2.4.2           # via docker
+pyasn1==0.4.5             # via paramiko
+pycparser==2.19           # via cffi
+pynacl==1.3.0             # via paramiko
+pyyaml==3.13
+requests==2.20.1          # via docker, docker-compose
+six==1.12.0               # via bcrypt, cryptography, docker, docker-compose, docker-pycreds, dockerpty, pynacl, websocket-client
 texttable==0.9.1          # via docker-compose
-urllib3==1.22             # via requests
-websocket-client==0.47.0  # via docker, docker-compose
+urllib3==1.24.1           # via requests
+websocket-client==0.56.0  # via docker, docker-compose
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -0,0 +1,12 @@
+# Version constraints for pip-installation.
+#
+# This file doesn't install any packages. It specifies version constraints
+# that will be applied if a package is needed.
+#
+# When pinning something here, please provide an explanation of why.  Ideally,
+# link to other information that will help people in the future to remove the
+# pin when possible.  Writing an issue against the offending project and
+# linking to it here is good.
+
+# functools32 is a backport which can only be installed on Python 2.7
+functools32 ; python_version == "2.7"
diff --git a/requirements/pip-tools.in b/requirements/pip-tools.in
@@ -1 +1,3 @@
+-c constraints.txt
+
 pip-tools
diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -4,7 +4,6 @@
 #
 #    make upgrade
 #
-click==6.7                # via pip-tools
-first==2.0.1              # via pip-tools
-pip-tools==2.0.2
-six==1.11.0               # via pip-tools
+click==7.0                # via pip-tools
+pip-tools==3.6.0
+six==1.12.0               # via pip-tools
diff --git a/scripts/restore.py b/scripts/restore.py
@@ -16,7 +16,7 @@
 DEVSTACK_REPO_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 # Use this minimal container image to restore volume content
-BACKUP_IMAGE = 'alpine:3.7'
+BACKUP_IMAGE = 'alpine:latest'
 
 
 def load_images():

diff --git a/scripts/snapshot.py b/scripts/snapshot.py
@@ -20,7 +20,7 @@
 REPO_SCRIPT = os.path.join(REPO_ROOT, 'repo.sh')
 
 # Use this minimal container image to fetch volume content
-BACKUP_IMAGE = 'alpine:3.7'
+BACKUP_IMAGE = 'alpine:latest'
 
 
 def make_directories(output_dir):