Merge pull request #2119 from peterbe/bug-980351-consolidating-our-re…

…quirements-and-virtualenv-woes

Bug 980351 consolidating our requirements and virtualenv woes

requirements.txt

@@ -113,3 +113,5 @@ pep8>=1.4.5
 pyflakes==0.8.1
 # sha256: IBHATOBcLURttngxfeVP4PgNdykbnQ1G-sknzAV8ZXo
 https://github.com/BradRuderman/pyhs2/archive/870d5590a97d53855a4aa6da70be8439ce4d690c.zip#egg=pyhs2
+# sha256: Tg3rRP5GuOADbGx7MBJV1RikfCQL6zZWn7Ua6aAwDpM
+django-jingo-offline-compressor==0.0.7

webapp-django/crashstats/settings/base.py

@@ -24,7 +24,6 @@
     '%s.auth' % PROJECT_MODULE,
     '%s.tokens' % PROJECT_MODULE,
     '%s.symbols' % PROJECT_MODULE,
-    'django_statsd',
     'django.contrib.messages',
     'raven.contrib.django.raven_compat',
     'waffle',
@@ -49,16 +48,11 @@
         MIDDLEWARE_CLASSES.remove(app)
 
 MIDDLEWARE_CLASSES = tuple(MIDDLEWARE_CLASSES) + (
-    'django_statsd.middleware.GraphiteRequestTimingMiddleware',
-    'django_statsd.middleware.GraphiteMiddleware',
     'waffle.middleware.WaffleMiddleware',
     '%s.tokens.middleware.APIAuthenticationMiddleware' % PROJECT_MODULE,
 )
 
 
-STATSD_CLIENT = 'django_statsd.clients.normal'
-
-
 # BrowserID configuration
 AUTHENTICATION_BACKENDS = [
     'django.contrib.auth.backends.ModelBackend',

webapp-django/manage.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 import os
 import sys
-import site
 
 # Edit this if necessary or override the variable in your environment.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'crashstats.settings')
@@ -24,22 +23,5 @@
 
 manage.setup_environ(__file__, more_pythonic=True)
 
-# We build binary packages on jenkins which installs itself
-# in vendor-local/lib64/python
-# Add it to sys.path just after vendor-local/lib/python which
-# funfactory already added
-_new_path = manage.path('vendor-local/lib64/python')
-site.addsitedir(
-    os.path.abspath(
-        _new_path
-    )
-)
-# now re-arrange so the order is right
-_other_path = manage.path('vendor-local/lib/python')
-sys.path.insert(sys.path.index(_other_path) + 1, _new_path)
-_other_path = manage.path('vendor-local')
-sys.path.insert(sys.path.index(_other_path) + 1, _new_path)
-
-
 if __name__ == "__main__":
     manage.main()