Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidation des logs #63

Merged
merged 5 commits into from
Mar 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dj-database-url = "*"
django-dirtyfields = "*"
django-filter = "*"
django-model-utils = "*"
django-auditlog = {git = "https://github.com/epfl-idevelop/django-auditlog.git", editable = true}
django-tequila = {git = "https://github.com/epfl-idevelop/django-tequila.git", editable = true}
"django-bootstrap4" = "*"
gevent = "*"
Expand Down
639 changes: 331 additions & 308 deletions Pipfile.lock

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
web:
build: .
restart: always
stdin_open: true
tty: true
expose:
# used by nginx: see proxy in sites-enabled
- "${DEV_PORT}"
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
web:
image: epflidevelop/infoscience-exports
restart: always
stdin_open: true
tty: true
expose:
- "80"
links:
Expand Down
3 changes: 3 additions & 0 deletions infoscience_exports/exports/models/export.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from django.db import models
from django.conf import settings

from auditlog.registry import auditlog
from dirtyfields import DirtyFieldsMixin

from .settings import BulletsSettings, ThumbnailSettings, LinksSettings, \
Expand Down Expand Up @@ -37,3 +38,5 @@ def get_absolute_url(self):

class Meta:
ordering = ['-id']

auditlog.register(Export)
2 changes: 2 additions & 0 deletions infoscience_exports/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ def get_env_variable(var_name):
# Third party apps
'bootstrap4',
'django_tequila',
'auditlog',

# Your apps
'exports',
Expand All @@ -70,6 +71,7 @@ def get_env_variable(var_name):
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django_tequila.middleware.TequilaMiddleware',
'auditlog.middleware.AuditlogMiddleware',
)

ROOT_URLCONF = 'urls'
Expand Down
147 changes: 75 additions & 72 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,73 +1,76 @@
-r requirements.txt
appnope==0.1.0; sys_platform == 'darwin'
asn1crypto==0.24.0
attrs==17.4.0
autopep8==1.3.4
bcrypt==3.1.4
blessings==1.6.1
certifi==2018.1.18
cffi==1.11.5
chardet==3.0.4
click==6.7
codecov==2.0.15
colorama==0.3.9; sys_platform == 'win32'
coverage==4.5.1
coveralls==1.3.0
cryptography==2.1.4
decorator==4.2.1
django-debug-toolbar==1.9.1
django-extensions==2.0.6
django-nose==1.4.5
django==2.0.3
docopt==0.6.2
fabric3==1.14.post1
factory-boy==2.10.0
faker==0.8.12
flake8==3.5.0
funcsigs==1.0.2; python_version < '3.0'
graypy==0.2.14
idna==2.6
ipdb==0.11
ipython-genutils==0.2.0
ipython==6.2.1
jedi==0.11.1
jinja2==2.10
livereload==2.5.1
markdown==2.6.11
markupsafe==1.0
mccabe==0.6.1
mkdocs==0.17.3
mock==2.0.0
nose-progressive==1.5.1
nose==1.3.7
paramiko==2.4.1
parso==0.1.1
pbr==3.1.1
pexpect==4.4.0; sys_platform != 'win32'
pickleshare==0.7.4
pluggy==0.6.0
prompt-toolkit==1.0.15
ptyprocess==0.5.2
py==1.5.2
pyasn1==0.4.2
pycodestyle==2.3.1
pycparser==2.18
pyflakes==1.6.0
pygments==2.2.0
pynacl==1.2.1
pytest==3.4.2
python-dateutil==2.7.0
pytz==2018.3
pyyaml==3.12
requests==2.18.4
rope==0.10.7
selenium==3.11.0
simplegeneric==0.8.1
six==1.11.0
sqlparse==0.2.4
text-unidecode==1.2
tornado==4.5.3
traitlets==4.3.2
typing==3.6.4; python_version < '3.5'
urllib3==1.22
wcwidth==0.1.7
autopep8==1.3.4
markdown==2.6.11
funcsigs==1.0.2; python_version < '3.3'
codecov==2.0.15
cffi==1.11.5; platform_python_implementation != 'PyPy'
ipython-genutils==0.2.0
faker==0.8.12
python-dateutil==2.7.0
nose-progressive==1.5.1
attrs==17.4.0
prompt-toolkit==1.0.15
click==6.7
paramiko==2.4.1
configparser==3.5.0; python_version < '3.2'
sqlparse==0.2.4
pexpect==4.4.0; sys_platform != 'win32'
backports.shutil-get-terminal-size==1.0.0; python_version == '2.7'
pygments==2.2.0
ipdb==0.11
py==1.5.2
selenium==3.11.0
ptyprocess==0.5.2
fabric3==1.14.post1
tornado==4.5.3
pytest==3.4.2
pickleshare==0.7.4
pluggy==0.6.0
typing==3.6.4; python_version < '3.5'
certifi==2018.1.18
bcrypt==3.1.4
mock==2.0.0
flake8==3.5.0
pynacl==1.2.1
pathlib2==2.3.0; python_version == '2.7' or python_version == '3.3'
simplegeneric==0.8.1
cryptography==2.2
livereload==2.5.1
factory-boy==2.10.0
pycparser==2.18
pyopenssl==17.5.0
urllib3==1.22
pyyaml==3.12
traitlets==4.3.2
django-extensions==2.0.6
pytz==2018.3
jinja2==2.10
coverage==4.5.1
ipython==5.5.0
ipaddress==1.0.19
# six==1.11.0
decorator==4.2.1
mkdocs==0.17.3
text-unidecode==1.2
graypy==0.2.14
pyflakes==1.6.0
coveralls==1.3.0
django-debug-toolbar==1.9.1
markupsafe==1.0
enum34==1.1.6; python_version < '3'
pyasn1==0.4.2
pbr==3.1.1
wcwidth==0.1.7
django==2.0.3
rope==0.10.7
mccabe==0.6.1
blessings==1.6.1
chardet==3.0.4
nose==1.3.7
pycodestyle==2.3.1
django-nose==1.4.5
requests==2.18.4
docopt==0.6.2
idna==2.6
asn1crypto==0.24.0
scandir==1.7; python_version < '3.5'
31 changes: 17 additions & 14 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
markdown==2.6.11
gunicorn==19.7.1
psycopg2-binary==2.7.4
pymarc==3.1.7
django-filter==1.1.0
pytz==2018.3
# six==1.11.0
django-dirtyfields==1.3.1
django-jsonfield==1.0.1
django-model-utils==3.1.1
gevent==1.2.2
python-dateutil==2.7.0
greenlet==0.4.13
django==2.0.3
django-bootstrap4==0.0.6
dj-database-url==0.5.0
-e git+https://github.com/epfl-idevelop/django-tequila.git@787b0af52142aad08fe739e821eff3c543991f61#egg=django-tequila
dj-database-url==0.5.0
django-bootstrap4==0.0.6
django-dirtyfields==1.3.1
django-filter==1.1.0
django-model-utils==3.1.1
django==2.0.3
gevent==1.2.2
greenlet==0.4.13
gunicorn==19.7.1
markdown==2.6.11
psycopg2-binary==2.7.4
pymarc==3.1.7
pytz==2018.3
six==1.11.0
-e git+https://github.com/epfl-idevelop/django-auditlog.git#egg=django-auditlog