From 3f0796647767e18cd665d78f40e59e442e08c680 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 20 Jun 2020 12:53:16 -0500 Subject: [PATCH] Simplfies CI config + Pins dep versions --- .circleci/config.yml | 9 ++++++--- dev-requirements.txt | 2 +- dj_rest_auth/tests/requirements.pip | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e80fac2..59f7b6a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,9 +12,12 @@ jobs: executor: docker/docker steps: - checkout - - run: pip install --user -r dev-requirements.txt - - run: pip install --user -r dj_rest_auth/tests/requirements.pip - - run: pip install -q --user coveralls djangorestframework==$DRF Django==$DJANGO_VERSION + - run: + command: cat dj_rest_auth/tests/requirements.pip dev-requirements.txt | pip install --user -r /dev/stdin + name: Install Static Test Dependencies + - run: + command: pip install -q --user coveralls djangorestframework==$DRF Django==$DJANGO_VERSION + name: Install Specific Django + DRF Deps. - run: command: | mkdir -p test-results/ diff --git a/dev-requirements.txt b/dev-requirements.txt index cee8ea6..73b9db0 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,5 +1,5 @@ --editable . responses>=0.5.0 djangorestframework-simplejwt==4.4.0 -django-allauth +django-allauth>=0.25.0 coveralls>=1.11.1 \ No newline at end of file diff --git a/dj_rest_auth/tests/requirements.pip b/dj_rest_auth/tests/requirements.pip index 9f28d70..66af74f 100644 --- a/dj_rest_auth/tests/requirements.pip +++ b/dj_rest_auth/tests/requirements.pip @@ -1,4 +1,4 @@ django-allauth>=0.25.0 -responses>=0.3.0 +responses>=0.5.0 flake8==2.4.0 djangorestframework-simplejwt==4.4.0