setup: Update dependencies (and a bit more) (#1730)

Along with updating dependencies I'm also addressing few other issues which will take full rebuild: - upgrade to python 3.7, fixes #1715 - switch from Flask-Cache to Flask-Caching, fixes #1285 - sharing pypi2nix cache between containers, fixes #1070
mozilla · Dec 6, 2018 · bdebc78 · bdebc78
1 parent 90a66cf
commit bdebc78
Show file tree

Hide file tree

Showing 105 changed files with 15,233 additions and 16,892 deletions.
diff --git a/lib/backend_common/backend_common/cache.py b/lib/backend_common/backend_common/cache.py
@@ -6,13 +6,13 @@
 import uuid
 
 import flask
-import flask_cache
+import flask_caching
 
 import backend_common.dockerflow
 import cli_common.log
 
 logger = cli_common.log.get_logger(__name__)
-cache = flask_cache.Cache()
+cache = flask_caching.Cache()
 
 
 def init_app(app):

diff --git a/lib/backend_common/requirements-dev.txt b/lib/backend_common/requirements-dev.txt
@@ -4,7 +4,7 @@ inotify  # needed by gunicorn for faster/better reload
 
 # tests dependencies
 Flask
-Flask-Cache
+Flask-Caching
 Flask-Cors
 Flask-Login
 Flask-Migrate

diff --git a/lib/backend_common/requirements-extra.json b/lib/backend_common/requirements-extra.json
@@ -36,7 +36,7 @@
         "requests"
     ],
     "cache": [
-        "Flask-Cache"
+        "Flask-Caching"
     ],
     "cors": [
         "Flask-Cors",

diff --git a/lib/cli_common/requirements-dev.txt b/lib/cli_common/requirements-dev.txt
@@ -17,7 +17,6 @@ responses
 
 # develop
 pdbpp
-ipdb
 
 # tests dependencies
 Logbook

diff --git a/lib/please_cli/default.nix b/lib/please_cli/default.nix
@@ -38,9 +38,15 @@ let
     passthru = {
       src_path = "lib/please_cli";
       update = writeScript "update-${self.name}" ''
-        pushd ${self.src_path}
-        ${pypi2nix}/bin/pypi2nix -v \
-          -V 3.6 \
+        pushd lib/${project_name}
+        cache_dir=$PWD/../../tmp/pypi2nix
+        mkdir -p $cache_dir
+        eval ${pypi2nix}/bin/pypi2nix -v \
+          -C $cache_dir \
+          -V 3.7 \
+          -O ../../nix/requirements_override.nix \
+          -e pytest-runner \
+          -e setuptools-scm \
           -r requirements.txt \
           -r requirements-dev.txt
         popd

diff --git a/lib/please_cli/requirements-dev.txt b/lib/please_cli/requirements-dev.txt
@@ -1,5 +1 @@
 -r ./../../lib/cli_common/requirements-dev.txt
-
-flake8
-pytest
-ipdb
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ responses @@
     # develop
     pdbpp
-    ipdb
     # tests dependencies
     Logbook
@@ Expand Down @@