Merge branch 'fix_push' into 'dev'

Merge remote-tracking branch 'origin/fix_req' into fix_req

See merge request !110
feature/fix_generate_pass
Andrey 8 years ago
commit 5562c4676c
  1. 2
      config_app/settings/dev.env
  2. 27
      requirements.txt

@ -1,5 +1,5 @@
DEBUG=True
SECRET_KEY='!eiquy7_+2#vn3z%zfp51$m-=tmvtcv*cj*@x$!v(_9btq0w=$'
DATABASE_URL='psql://postgres@127.0.0.1:5432/test_lms'
DATABASE_URL='psql://lms_dev_user:HJin2dt3@127.0.0.1:5432/lms_dev'
EMAIL_URL='smtp+tls://9ae31a1a770138:a7d79ee373a14c@smtp.mailtrap.io:2525'
CACHE_URL=rediscache://127.0.0.1:6379/1?client_class=django_redis.client.DefaultClient

@ -17,33 +17,6 @@ requests==2.18.4
Unidecode==0.4.21
PyJWT==1.5.3
# amqp==2.2.2
# Babel==2.5.1
# billiard==3.5.0.3
# bson==0.5.0
# certifi==2017.11.5
# chardet==3.0.4
# django-appconf==1.0.2
# django-model-utils==3.0.0
# environ==1.0
# flower==0.9.2
# future==0.16.0
# idna==2.6
# kombu==4.1.0
# lxml==4.1.1
# Naked==0.1.31
# olefile==0.44
# phonenumberslite==8.8.8
# pkg-resources==0.0.0
# python-gitlab==1.1.0
# pytz==2017.2
# PyYAML==3.12
# redis==2.10.6
# six==1.11.0
# tornado==4.5.2
# urllib3==1.22
# vine==1.1.4
# testing
flake8==3.5.0
pytest==3.4.1

Loading…
Cancel
Save