From df88d8d687bd93a421be5f512e695e7b93d715c8 Mon Sep 17 00:00:00 2001 From: Anna Sidwell Date: Sun, 7 Apr 2019 16:24:46 +0100 Subject: [PATCH] Update to django-cas-server 1.1 w Django 2.1 support --- .gitlab-ci.yml | 1 - Dockerfile | 1 - requirements/base.in | 9 +++++---- requirements/base.txt | 7 +++++-- setup.cfg | 1 - 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 616b805..01325ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,6 @@ pytest: - pip install -U pip setuptools - pip install -r requirements/base.txt - pip install -r requirements/test.txt - - pip install -e git+git://github.com/nitmir/django-cas-server.git@248658b52d3f87d7275a05d5e2c9773a0c2bc5a2#egg=django-cas-server - apt-get update && cat system-requirements-debian.txt | xargs apt-get install -y - python manage.py collectstatic script: diff --git a/Dockerfile b/Dockerfile index be44e49..475819e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,7 +53,6 @@ RUN apt-get update && apt-get install -y gettext git WORKDIR /app COPY ./requirements/base.txt requirements-base.txt RUN python3 -m pip install -r requirements-base.txt -RUN python3 -m pip install -e git+git://github.com/nitmir/django-cas-server.git@248658b52d3f87d7275a05d5e2c9773a0c2bc5a2#egg=django-cas-server # APP WORKDIR /app diff --git a/requirements/base.in b/requirements/base.in index 3a7c904..2c2755f 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,12 +1,13 @@ boto boto3 django -django-autocomplete-light -django-appconf django-anymail +django-appconf +django-autocomplete-light django-avatar django-bootstrap3 django-braces +django-cas-server django-compressor django-countries django-crispy-forms @@ -17,12 +18,12 @@ django-leaflet django-multipleselectfield django-multiupload django-phonenumber-field -django-storages django-registration-redux +django-storages djangorestframework djangorestframework-gis -gunicorn gevent +gunicorn pip-tools psycopg2-binary python-memcached diff --git a/requirements/base.txt b/requirements/base.txt index 46bfa73..582aaba 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -17,6 +17,7 @@ django-autocomplete-light==3.3.2 django-avatar==4.1.0 django-bootstrap3==11.0.0 django-braces==1.13.0 +django-cas-server==1.1.0 django-compressor==2.2 django-countries==5.3.2 django-crispy-forms==1.7.2 @@ -38,6 +39,7 @@ greenlet==0.4.15 # via gevent gunicorn==19.9.0 idna==2.7 # via requests jmespath==0.9.3 # via boto3, botocore +lxml==4.3.3 # via django-cas-server phonenumbers==8.9.14 # via django-phonenumber-field pillow==5.2.0 # via django-avatar pip-tools==3.1.0 @@ -47,9 +49,10 @@ python-memcached==1.59 pytz==2018.5 # via babel, django raven==6.9.0 rcssmin==1.0.6 -requests==2.19.1 # via django-anymail +requests-futures==0.9.9 # via django-cas-server +requests==2.19.1 # via django-anymail, django-cas-server, requests-futures rjsmin==1.0.12 s3transfer==0.1.13 # via boto3 -six==1.11.0 # via django-anymail, django-extensions, django-geojson, djangorestframework-gis, pip-tools, python-dateutil, python-memcached +six==1.11.0 # via django-anymail, django-cas-server, django-extensions, django-geojson, djangorestframework-gis, pip-tools, python-dateutil, python-memcached urllib3==1.23 # via botocore, requests whitenoise==4.1 diff --git a/setup.cfg b/setup.cfg index 879b9ee..cae3ea2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,4 +2,3 @@ DJANGO_SETTINGS_MODULE = ojusomap.settings python_files = tests.py test_*.py *_tests.py addopts = --reuse-db --strict --tb=short -norecursedirs = django-cas-server django-multiselectfield