Merge branch 'develop' into pyup/scheduled-update-2019-05-01

jason-neal · May 2, 2019 · 287150c · 287150c
2 parents 8bab675 + 3f3a92c
commit 287150c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.shippable.yml b/.shippable.yml
@@ -12,7 +12,7 @@ build:
       - $HOME/data
 
   ci:
-    - pip install --upgrade pip
+    # - pip install --upgrade pip
     # Install eniric requirements
     - travis_retry pip install -r requirements_dev.txt
     - travis_retry pip install -r requirements.txt

diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ cache:
     - $HOME/data
 
 install:
-  - pip install --upgrade pip
+  #  - pip install --upgrade pip
   # Install eniric requirements
   - travis_retry pip install -r requirements_dev.txt
   - travis_retry pip install -r requirements.txt

diff --git a/appveyor.yml b/appveyor.yml
@@ -13,7 +13,7 @@ cache:
 
 install:
   - SET PATH=%PYTHON%;%PYTHON%\Scripts\;%path%
-  - "%PYTHON%\\python.exe -m pip install --upgrade pip"
+  # - "%PYTHON%\\python.exe -m pip install --upgrade pip"
   # We need wheel installed to build wheels
   - "%PYTHON%\\python.exe -m pip install wheel"
   -

diff --git a/setup.py b/setup.py
@@ -51,7 +51,7 @@
             "codeclimate-test-reporter>=0.2.3",
             "python-coveralls>=2.9.1",
         ],
-    },  # $ pip install -e .[dev,test, docs]
+    },  # $ pip install -e .[dev,test, docs] --no-use-pep517
     "packages": find_packages(),
     "scripts": [
         "scripts/phoenix_precision.py",