Keep requirements.in updated after merge

DjangoGirls · Jan 21, 2017 · 02c1ccd · 02c1ccd
1 parent 28294e3
commit 02c1ccd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 22 deletions.
diff --git a/djangogirls/settings.py b/djangogirls/settings.py
@@ -36,8 +36,6 @@
     'easy_thumbnails',
     'captcha',
     'django_countries',
-    'bootstrap3_datetime',
-    'ckeditor',
     'gulp_rev',
 
     'core',
@@ -251,17 +249,6 @@
 
 APPEND_SLASH = True
 
-CKEDITOR_UPLOAD_PATH = "uploads/"
-CKEDITOR_CONFIGS = {
-    'default': {
-        'toolbar': [
-    		 ['-', 'Bold', 'Italic', 'Underline'],
-             ['-', 'Link', 'Unlink'],
-             ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-'],
-        ],
-    },
-}
-
 JOBS_EMAIL_USER = os.environ.get('JOBS_EMAIL_USER')
 JOBS_EMAIL_PASSWORD = os.environ.get('JOBS_EMAIL_PASSWORD')
 

diff --git a/requirements.in b/requirements.in
@@ -1,11 +1,8 @@
--e git+https://github.com/olasitarska/django-bootstrap3-datetimepicker#egg=django-bootstrap3-datetimepicker
-
 boto3
 click
 django-autoslug
 django-click
 dj-database-url
-django-ckeditor
 django-codemirror-widget
 django-countries
 django-date-extensions
@@ -20,9 +17,10 @@ django-suit
 Django
 djrill
 easy_thumbnails
+google-api-python-client
+httplib2
 icalendar
 lxml
-mandrill
 mock
 opbeat
 Pillow

diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,6 @@
 #
 #    pip-compile --output-file requirements.txt requirements.in
 #
--e git+https://github.com/olasitarska/django-bootstrap3-datetimepicker#egg=django-bootstrap3-datetimepicker
 boto3==1.4.3
 botocore==1.4.93          # via boto3, s3transfer
 certifi==2016.9.26        # via opbeat
@@ -13,7 +12,6 @@ coverage==4.3.1           # via pytest-cov
 cssselect==1.0.0          # via pyquery
 dj-database-url==0.4.2
 django-autoslug==1.9.3
-django-ckeditor==5.2.1
 django-click==1.2.0
 django-codemirror-widget==0.4.1
 django-countries==4.0
@@ -28,7 +26,6 @@ django-suit-redactor==0.0.4
 django-suit==0.2.23
 django==1.10.5
 djrill==2.1.0
-docopt==0.4.0             # via mandrill
 docutils==0.13.1          # via botocore
 easy_thumbnails==2.3
 freezegun==0.3.8
@@ -37,10 +34,10 @@ httplib2==0.9.2
 icalendar==3.11.2
 jmespath==0.9.0           # via boto3, botocore
 lxml==3.7.2
-mandrill==1.0.57
 markdown2==2.3.2          # via django-markdown-deux
 mock==2.0.0
 multidict==2.1.4          # via yarl
+oauth2client==4.0.0       # via google-api-python-client
 oauthlib==2.0.1           # via requests-oauthlib
 olefile==0.44             # via pillow
 opbeat==3.5.2
@@ -49,6 +46,8 @@ pillow==4.0.0
 psycopg2==2.6.2
 py-trello==0.8.0
 py==1.4.32                # via pytest
+pyasn1-modules==0.0.8     # via oauth2client
+pyasn1==0.1.9             # via oauth2client, pyasn1-modules, rsa
 pyquery==1.2.17
 pytest-cov==2.4.0
 pytest-django==3.1.2
@@ -58,9 +57,11 @@ pytz==2016.10             # via icalendar, py-trello
 pyyaml==3.12              # via vcrpy
 requests-oauthlib==0.7.0  # via py-trello
 requests==2.12.4
+rsa==3.4.2                # via oauth2client
 s3transfer==0.1.10        # via boto3
-six==1.10.0               # via django-click, freezegun, mock, python-dateutil, vcrpy
+six==1.10.0               # via django-click, freezegun, google-api-python-client, mock, oauth2client, python-dateutil, vcrpy
 slacker==0.9.30
+uritemplate==3.0.0        # via google-api-python-client
 urllib3==1.19.1           # via opbeat
 vcrpy==1.10.5
 whitenoise==3.2.3