Merge pull request #486 from alphagov/ris-freeze-requirements-upgrade…

…-pip

repoutils.freeze_requirements: upgrade pip to latest version in newly created venv

default.nix

@@ -23,7 +23,7 @@ in (with args; {
 
     hardeningDisable = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "format" ];
 
-    VIRTUALENV_ROOT = "venv${pythonPackages.python.pythonVersion}";
+    VIRTUALENV_ROOT = (toString (./.)) + "/venv${pythonPackages.python.pythonVersion}";
     VIRTUAL_ENV_DISABLE_PROMPT = "1";
     SOURCE_DATE_EPOCH = "315532800";
 
@@ -37,7 +37,8 @@ in (with args; {
         ${pythonPackages.python}/bin/python -m venv $VIRTUALENV_ROOT
       fi
       source $VIRTUALENV_ROOT/bin/activate
-      make requirements${pkgs.stdenv.lib.optionalString forDev "-dev"}
+      pip install --upgrade pip==18.0  # some packages are sensitive to "old" pips
+      make -C ${toString (./.)} requirements${pkgs.stdenv.lib.optionalString forDev "-dev"}
     '';
   }).overrideAttrs (if builtins.pathExists localOverridesPath then (import localOverridesPath args) else (x: x));
 })

dmutils/__init__.py

@@ -2,4 +2,4 @@
 from .flask_init import init_app, init_manager
 
 
-__version__ = '45.4.0'
+__version__ = '45.5.0'

dmutils/repoutils/freeze_requirements.py

@@ -60,6 +60,14 @@ def exit_failure(messages, code=1):
     logger.info(f'Creating virtualenv: {virtualenv_name}')
     venv.main(args=(virtualenv_name,))
 
+    logger.info(f'Upgrading pip version in virtualenv: {virtualenv_name}')
+    install_cmd = subprocess.run(
+        [f'{virtualenv_name}/bin/pip', 'install', '--upgrade', 'pip'],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        universal_newlines=True
+    )
+
     logger.info(f'Installing requirements from {target} in virtualenv: {virtualenv_name}')
     install_cmd = subprocess.run(
         [f'{virtualenv_name}/bin/pip', 'install', '-r', target],