Merge branch 'requirements' into 'master'

Requirements

See merge request bde/nk20!46
This commit is contained in:
Benjamin Graillot 2020-03-08 22:42:22 +01:00
commit 8cbf56b5a6
8 changed files with 19 additions and 11 deletions

View File

@ -10,7 +10,10 @@ RUN apt update && \
rm -rf /var/lib/apt/lists/*
COPY requirements.txt /code/
RUN pip install -r requirements.txt
RUN pip install -r requirements/base.txt
RUN pip install -r requirements/api.txt
RUN pip install -r requirements/cas.txt
RUN pip install -r requirements/production.txt
COPY . /code/

View File

@ -31,7 +31,7 @@ On supposera pour la suite que vous utiliser debian/ubuntu sur un serveur tout n
$ python3 -m venv env
$ source env/bin/activate
(env)$ pip3 install -r requirements.txt
(env)$ pip3 install -r requirements/base.txt
(env)$ deactivate
4. uwsgi et Nginx

View File

@ -37,7 +37,6 @@ INSTALLED_APPS = [
# External apps
'polymorphic',
'reversion',
'crispy_forms',
'django_tables2',
# Django contrib

3
requirements/api.txt Normal file
View File

@ -0,0 +1,3 @@
djangorestframework==3.9.0
django-rest-polymorphic==0.1.8

View File

@ -4,16 +4,10 @@ defusedxml==0.6.0
Django~=2.2
django-allauth==0.39.1
django-autocomplete-light==3.5.1
django-cas-client==1.5.3
django-cas-server==1.1.0
django-crispy-forms==1.7.2
django-extensions==2.1.9
django-filter==2.2.0
django-guardian==2.1.0
django-polymorphic==2.0.3
djangorestframework==3.9.0
django-rest-polymorphic==0.1.8
django-reversion==3.0.3
django-tables2==2.1.0
docutils==0.14
idna==2.8

2
requirements/cas.txt Normal file
View File

@ -0,0 +1,2 @@
django-cas-client==1.5.3
django-cas-server==1.1.0

View File

@ -0,0 +1 @@
psycopg2==2.8.4

10
tox.ini
View File

@ -9,7 +9,10 @@ skipsdist = True
setenv =
PYTHONWARNINGS = all
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/requirements/base.txt
-r{toxinidir}/requirements/api.txt
-r{toxinidir}/requirements/cas.txt
-r{toxinidir}/requirements/production.txt
coverage
commands =
./manage.py makemigrations
@ -18,7 +21,10 @@ commands =
[testenv:linters]
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/requirements/base.txt
-r{toxinidir}/requirements/api.txt
-r{toxinidir}/requirements/cas.txt
-r{toxinidir}/requirements/production.txt
flake8
flake8-colors
flake8-import-order