Merge pull request #483 from eventoL/clean_dependencies

Clean dependencies and remove ELK stack

eventol/eventol/settings.py

@@ -46,9 +46,7 @@ class Base(Configuration):
         'easy_thumbnails.optimize',
         'image_cropping',
         'import_export',
-        'django_nose',
         'manager',
-        'autofixture',
         'djangoformsetjs',
         'django.contrib.sites',
         'allauth',
@@ -57,14 +55,12 @@ class Base(Configuration):
         'allauth.socialaccount.providers.twitter',
         'allauth.socialaccount.providers.google',
         'allauth.socialaccount.providers.github',
-        'debug_toolbar',
         'captcha',
         'django.contrib.postgres',
         'webpack_loader',
         'django_filters',
         'rest_framework',
         'channels',
-        'django_elasticsearch_dsl',
         'django_extensions',
         'vote',
         'forms_builder.forms',
@@ -360,49 +356,31 @@ class Staging(Base):
                 'maxBytes': 1024*1024*10,
                 'backupCount': 10,
                 'formatter': 'logservices'
-            },
-            'logstash': {
-                'level': 'DEBUG',
-                'class': 'logstash.TCPLogstashHandler',
-                'host': os.getenv('LOGSTASH_HOST', 'logstash'),
-                'port': os.getenv('LOGSTASH_PORT', 5000),
-                'version': 1,
-                'message_type': 'django',
-                'fqdn': False,
-                'tags': ['eventol', 'django.request', 'django.channels', 'django']
             }
         },
         'loggers': {
             'eventol': {
-                'handlers': ['logstash', 'file'],
+                'handlers': ['file'],
                 'level': 'DEBUG',
                 'propagate': True
             },
             'django.channels': {
-                'handlers': ['logstash', 'file'],
+                'handlers': ['file'],
                 'level': 'WARNING',
                 'propagate': True
             },
             'django.request': {
-                'handlers': ['logstash', 'file'],
+                'handlers': ['file'],
                 'level': 'WARNING',
                 'propagate': True
             },
             'django': {
-                'handlers': ['logstash', 'console'],
+                'handlers': ['console'],
                 'level': 'WARNING',
                 'propagate': True
             }
         }
     }
-    ELASTICSEARCH_DSL = {
-        'default': {
-            'hosts': '{0}:{1}'.format(
-                os.getenv('ELASTICSEARCH_HOST', 'elasticsearch'),
-                os.getenv('ELASTICSEARCH_PORT', 9200)
-            )
-        }
-    }
     STATIC_ROOT = os.path.join(BASE_DIR, 'static')
     STATIC_URL = '/static/'
     MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
@@ -414,6 +392,11 @@ class Prod(Staging):
 
 
 class Dev(Base):
+    INSTALLED_APPS = Base.INSTALLED_APPS + (
+        'django_nose',
+        'autofixture',
+        'debug_toolbar',
+    )
     AUTH_PASSWORD_VALIDATORS = []
     WEBPACK_LOADER = {
         'DEFAULT': {
@@ -453,14 +436,6 @@ class Dev(Base):
             }
         }
     }
-    ELASTICSEARCH_DSL = {
-        'default': {
-            'hosts': '{0}:{1}'.format(
-                os.getenv('ELASTICSEARCH_HOST', 'elasticsearch'),
-                os.getenv('ELASTICSEARCH_PORT', 9200)
-            )
-        }
-    }
 
 
 class Test(Dev):

requirements-dev.txt

@@ -1,12 +1,7 @@
-astroid==1.5.3
 pylint==1.8.4
-pylint-django==0.11
-pylint-plugin-utils==0.2.6
-pytest==3.2.3
-pytest-cov==2.5.1
-pytest-django==3.1.2
-django-dynamic-fixture==1.9.5
 django-nose==1.4.5
+django-autofixture==0.12.1
+django-debug-toolbar==1.9.1
 mock==2.0.0
-Werkzeug==0.14.1
+pylint-django==0.11
 ipython

requirements.txt

@@ -1,79 +1,26 @@
-asgi-ipc==1.4.2
 asgi-redis==1.4.3
-asgiref==1.1.2
-attrs==17.3.0
-autobahn==17.10.1
-Automat==0.6.0
-cairocffi==0.8.0
-CairoSVG==2.1.1
-certifi==2017.11.5
-cffi==1.11.2
-channels==1.1.8
-chardet==3.0.4
-constantly==15.1.0
-cssselect2==0.2.1
-daphne==1.3.0
-defusedxml==0.5.0
-diff-match-patch==20121119
 Django==1.11.16
-django-allauth==0.34.0
-django-appconf==1.0.2
-django-autocomplete-light==3.2.10
-django-autofixture==0.12.1
 django-configurations==2.0
+easy-thumbnails==2.5
+django-autocomplete-light==3.2.10
 django-ckeditor==5.3.1
-django-debug-toolbar==1.9.1
-django-elasticsearch-dsl==0.4.4
-django-extensions==2.0.7
-django-filter==1.1.0
-django-forms-builder==0.14.0
-django-formset-js==0.5.0
 django-image-cropping==1.1.0
 django-import-export==0.6.0
-django-jquery-js==3.1.1
-django-js-asset==0.1.1
-django-mailgun==0.9.1
+django-formset-js==0.5.0
+django-allauth==0.34.0
 django-simple-captcha==0.5.6
-django-vote==2.1.7
+psycopg2-binary==2.7.5
 django-webpack-loader==0.5.0
+django-filter==1.1.0
 djangorestframework==3.7.3
 djangorestframework-filters==0.10.2
 djangorestframework-queryfields==1.0.0
-easy-thumbnails==2.5
-elasticsearch==5.5.2
-elasticsearch-dsl==5.4.0
-et-xmlfile==1.0.1
-hyperlink==17.3.1
-idna==2.6
-incremental==17.5.0
-jdcal==1.3
-lxml==4.1.1
-oauthlib==2.0.6
-odfpy==1.3.5
-olefile==0.44
-openpyxl==2.4.9
-Pillow==4.3.0
-psycopg2-binary==2.7.5
-pycparser==2.18
-pypng==0.0.18
+django-vote==2.1.7
+channels==1.1.8
+django-extensions==2.0.7
+django-forms-builder==0.14.0
+asgi-ipc==1.4.2
 PyQRCode==1.2.1
-python-logstash==0.4.6
-python3-openid==3.1.0
-pytz==2017.2
-PyYAML==3.12
-redis==2.10.6
-requests==2.18.4
-requests-oauthlib==0.8.0
-six==1.11.0
-sqlparse==0.2.4
 svglue==0.3.0
-tablib==0.12.1
-tinycss2==0.6.1
-Twisted==17.9.0
-txaio==2.8.2
-unicodecsv==0.14.1
-urllib3==1.22
-webencodings==0.5.1
-xlrd==1.1.0
-xlwt==1.3.0
-zope.interface==4.4.3
+CairoSVG==2.1.1
+pypng==0.0.18