autonomic-cooperative/ojuso-map
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to django-cas-server 1.1 w Django 2.1 support

Browse Source
This commit is contained in:
Anna Sidwell 2019-04-07 16:24:46 +01:00
parent 795010f6c8
commit df88d8d687
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -27,7 +27,6 @@ pytest:
- pip install -U pip setuptools - pip install -U pip setuptools
- pip install -r requirements/base.txt - pip install -r requirements/base.txt
- pip install -r requirements/test.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 - apt-get update && cat system-requirements-debian.txt | xargs apt-get install -y
- python manage.py collectstatic - python manage.py collectstatic
script: script:

1
Dockerfile
View File

@ -53,7 +53,6 @@ RUN apt-get update && apt-get install -y gettext git
WORKDIR /app WORKDIR /app
COPY ./requirements/base.txt requirements-base.txt COPY ./requirements/base.txt requirements-base.txt
RUN python3 -m pip install -r 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 # APP
WORKDIR /app WORKDIR /app

9
requirements/base.in
View File

@ -1,12 +1,13 @@
boto boto
boto3 boto3
django django
django-autocomplete-light
django-appconf
django-anymail django-anymail
django-appconf
django-autocomplete-light
django-avatar django-avatar
django-bootstrap3 django-bootstrap3
django-braces django-braces
django-cas-server
django-compressor django-compressor
django-countries django-countries
django-crispy-forms django-crispy-forms
@ -17,12 +18,12 @@ django-leaflet
django-multipleselectfield django-multipleselectfield
django-multiupload django-multiupload
django-phonenumber-field django-phonenumber-field
django-storages
django-registration-redux django-registration-redux
django-storages
djangorestframework djangorestframework
djangorestframework-gis djangorestframework-gis
gunicorn
gevent gevent
gunicorn
pip-tools pip-tools
psycopg2-binary psycopg2-binary
python-memcached python-memcached

7
requirements/base.txt
View File

@ -17,6 +17,7 @@ django-autocomplete-light==3.3.2
django-avatar==4.1.0 django-avatar==4.1.0
django-bootstrap3==11.0.0 django-bootstrap3==11.0.0
django-braces==1.13.0 django-braces==1.13.0
django-cas-server==1.1.0
django-compressor==2.2 django-compressor==2.2
django-countries==5.3.2 django-countries==5.3.2
django-crispy-forms==1.7.2 django-crispy-forms==1.7.2
@ -38,6 +39,7 @@ greenlet==0.4.15 # via gevent
gunicorn==19.9.0 gunicorn==19.9.0
idna==2.7 # via requests idna==2.7 # via requests
jmespath==0.9.3 # via boto3, botocore jmespath==0.9.3 # via boto3, botocore
lxml==4.3.3 # via django-cas-server
phonenumbers==8.9.14 # via django-phonenumber-field phonenumbers==8.9.14 # via django-phonenumber-field
pillow==5.2.0 # via django-avatar pillow==5.2.0 # via django-avatar
pip-tools==3.1.0 pip-tools==3.1.0
@ -47,9 +49,10 @@ python-memcached==1.59
pytz==2018.5 # via babel, django pytz==2018.5 # via babel, django
raven==6.9.0 raven==6.9.0
rcssmin==1.0.6 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 rjsmin==1.0.12
s3transfer==0.1.13 # via boto3 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 urllib3==1.23 # via botocore, requests
whitenoise==4.1 whitenoise==4.1

1
setup.cfg
View File

@ -2,4 +2,3 @@
DJANGO_SETTINGS_MODULE = ojusomap.settings DJANGO_SETTINGS_MODULE = ojusomap.settings
python_files = tests.py test_*.py *_tests.py python_files = tests.py test_*.py *_tests.py
addopts = --reuse-db --strict --tb=short addopts = --reuse-db --strict --tb=short
norecursedirs = django-cas-server django-multiselectfield