Merge branch 'master' into pyup-update-pytest-4.5.0-to-4.6.3

zdict · Jun 17, 2019 · 91ffd1d · 91ffd1d
2 parents 309947a + 03e4259
commit 91ffd1d
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 34 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -57,21 +57,22 @@ variables:
 
       - restore_cache:
           keys:
-          - pip-cache-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements-test.txt" }}-{{ checksum "requirements.txt" }}
+          - pip-cache-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements-test.txt" }}-{{ checksum "requirements.txt" }}-{{ checksum "Pipfile" }}
 
       - run:
           name: install dependencies
           command: |
             pip install --user -U pip
             python3 -m venv venv
             . venv/bin/activate
+            pip install -r requirements.txt
             pip install -r requirements-test.txt
             pip install coveralls
 
       - save_cache:
           paths:
             - ./venv
-          key: pip-cache-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements-test.txt" }}-{{ checksum "requirements.txt" }}
+          key: pip-cache-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements-test.txt" }}-{{ checksum "requirements.txt" }}-{{ checksum "Pipfile" }}
 
       - run:
           name: run tests
@@ -129,7 +130,7 @@ jobs:
 
       - restore_cache:
           keys:
-          - pip-cache-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements-test.txt" }}-{{ checksum "requirements.txt" }}
+          - pip-cache-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements-test.txt" }}-{{ checksum "requirements.txt" }}-{{ checksum "Pipfile" }}
 
       - run:
           name: install dependencies
@@ -143,7 +144,7 @@ jobs:
       - save_cache:
           paths:
             - ./venv
-          key: pip-cache-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements-test.txt" }}-{{ checksum "requirements.txt" }}
+          key: pip-cache-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements-test.txt" }}-{{ checksum "requirements.txt" }}-{{ checksum "Pipfile" }}
 
 
       - run:

diff --git a/.pyup.yml b/.pyup.yml
@@ -4,4 +4,3 @@ requirements:
   - requirements.txt
   - test-requirements.txt
   - Pipfile
-  - Pipfile.lock
diff --git a/Pipfile b/Pipfile
@@ -8,7 +8,7 @@ name = "pypi"
 [packages]
 
 beautifulsoup4 = "==4.7.1"
-peewee = "==3.9.5"
+peewee = "==3.9.6"
 requests = "==2.21.0"
 
 

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 beautifulsoup4==4.7.1
-peewee==3.9.5
+peewee==3.9.6
 requests==2.21.0