From 0eff007ca0ff9d15dd374ae7672e3215a27a402d 2018-10-04 20:14:17 From: Brett Smith Date: 2018-10-04 20:14:17 Subject: [PATCH] Remove unwanted dependencies. This doesn't remove all trace of them but it's enough to avoid installing them and still be able to see the front page. --- diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index af3e4e69cc4af34a8cbeb62b9f895cf699923cdf..6663f3bd035420193197bddd39bd829906b53a8a 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -15,8 +15,6 @@ DATABASES = { } } -UNPREPEND_WWW = bool(int(os.environ.get("DJANGO_UNPREPEND_WWW", "0"))) - # HEROKU: Update database configuration with $DATABASE_URL. import dj_database_url db_from_env = dj_database_url.config() @@ -49,11 +47,6 @@ admin_email = os.environ.get("DJANGO_ADMIN_EMAIL", None) if admin_email is not None: ADMINS = [("Webmaster", admin_email)] - -# Use SSLRedirectMiddleware -SSL_ON = os.environ.get("DJANGO_SSL_ON", True) -SSL_ALWAYS = os.environ.get("DJANGO_SSL_ALWAYS", False) - # Language code for this installation. All choices can be found here: # http://www.i18nguy.com/unicode/language-identifiers.html LANGUAGE_CODE = "en-us" @@ -103,14 +96,6 @@ STATICFILES_FINDERS = [ "compressor.finders.CompressorFinder", ] - -# Amazon S3 setup -DEFAULT_FILE_STORAGE = os.environ.get("DJANGO_DEFAULT_FILE_STORAGE", 'django.core.files.storage.FileSystemStorage') # noqa -AWS_ACCESS_KEY_ID = os.environ.get("DJANGO_AWS_ACCESS_KEY_ID", None) -AWS_SECRET_ACCESS_KEY = os.environ.get("DJANGO_AWS_SECRET_ACCESS_KEY", None) -AWS_STORAGE_BUCKET_NAME = os.environ.get("DJANGO_AWS_STORAGE_BUCKET_NAME", None) - - # Make this unique, and don't share it with anybody. SECRET_KEY = "6r&z0i#!k-thu4nv^zzx!f$fbp(i5mq_^%%@ihu_qxxotl_" @@ -135,7 +120,6 @@ TEMPLATES = [ "account.context_processors.account", "pinax_theme_bootstrap.context_processors.theme", "symposion.reviews.context_processors.reviews", - "sekizai.context_processors.sekizai", ], }, }, @@ -152,9 +136,6 @@ MIDDLEWARE_CLASSES = [ "django.contrib.messages.middleware.MessageMiddleware", "reversion.middleware.RevisionMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", - "ssl_redirect.middleware.SSLRedirectMiddleware", - "pinaxcon.middleware.CanonicalHostMiddleware", - "pinaxcon.middleware.UnprependWWWMiddleware", "pinaxcon.monkey_patch.MonkeyPatchMiddleware", ] @@ -181,7 +162,6 @@ INSTALLED_APPS = [ "easy_thumbnails", "taggit", "reversion", - "metron", "sitetree", "pinax.boxes", "pinax.eventlog", @@ -215,21 +195,6 @@ INSTALLED_APPS = [ "pinaxcon.proposals", "pinaxcon.registrasion", - #testing - "django_nose", - - # wiki - 'django.contrib.humanize', - 'django_nyt', - 'mptt', - 'sekizai', - #'sorl.thumbnail', - 'wiki', - 'wiki.plugins.attachments', - 'wiki.plugins.notifications', - #'wiki.plugins.images', - 'wiki.plugins.macros', - # stylesheets and js 'compressor', @@ -328,26 +293,8 @@ ATTENDEE_PROFILE_MODEL = "pinaxcon.registrasion.models.AttendeeProfile" # in order to register. TICKET_PRODUCT_CATEGORY = 1 - INVOICE_CURRENCY = "USD" -WIKI_ACCOUNT_HANDLING = False -WIKI_ACCOUNT_SIGNUP_ALLOWED = False - -WIKI_ANONYMOUS_WRITE = False -WIKI_ANONYMOUS_UPLOAD = False - - -# Use nose to run all tests -TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' - - -# Tell nose to measure coverage on the 'foo' and 'bar' apps -NOSE_ARGS = [ - '--with-coverage', - '--cover-package=registrasion.controllers,registrasion.models', -] - MARKDOWN_DEUX_STYLES = { "default": { "safe_mode": False, diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html index fd212db75fc36b89599481099a750f45ca560b44..315d2180beaaa6c2d6316472a1b116317566ecf1 100644 --- a/pinaxcon/templates/site_base.html +++ b/pinaxcon/templates/site_base.html @@ -1,7 +1,6 @@ {% extends "override_bootstrap_theme_base.html" %} {% load staticfiles %} -{% load metron_tags %} {% load i18n %} {% load sitetree %} @@ -78,6 +77,5 @@ {% endblock %} {% block extra_body_base %} - {% analytics %} {% block extra_body %}{% endblock %} {% endblock %} diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index a54b73c694897c5fcfd2410d9d12deaba44e172b..65c8fd59a40bdd48247ec0d661d4f1dbc287761b 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -4,8 +4,6 @@ from django.conf.urls.static import static from django.contrib.staticfiles.templatetags.staticfiles import static as _static from django.views.generic import TemplateView from django.views.generic import RedirectView -from django_nyt.urls import get_pattern as get_nyt_pattern -from wiki.urls import get_pattern as get_wiki_pattern from django.contrib import admin @@ -100,9 +98,6 @@ urlpatterns = [ url(r'^tickets/', include('registrasion.urls')), url(r'^nested_admin/', include('nested_admin.urls')), - url(r'^wiki/notifications/', get_nyt_pattern()), - url(r'^wiki/', get_wiki_pattern()) - # Catch-all MUST go last. #url(r"^", include("pinax.pages.urls")), ] diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 6301390b352f6b4f382b42128a72261202255c91..0000000000000000000000000000000000000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ --r requirements/base.txt --r requirements/heroku.txt diff --git a/requirements/base.txt b/requirements/base.txt deleted file mode 100644 index a5d6b4e29939d987703712f606560c05fa517cc1..0000000000000000000000000000000000000000 --- a/requirements/base.txt +++ /dev/null @@ -1,31 +0,0 @@ -Django>=1.11,<1.12 -boto3==1.4.6 -pinax-theme-bootstrap==7.3.0 -django-user-accounts==1.3.1 -metron==1.3.7 -pinax-eventlog==1.1.1 -dj-static==0.0.6 -dj-database-url==0.4.0 -pinax-pages==0.4.2 -pinax-boxes==2.1.2 -django-ssl-redirect==2.0 -django-storages==1.6.5 -django-libsass==0.7 -django-markdown-deux==1.0.5 -django-sitetree==1.8.0 -django-countries==4.6.1 -easy-thumbnails==2.4.1 -django-timezone-field==2.0 -django-model-utils==3.0.0 -wiki==0.3b3 -django-email-log==0.2.0 - -# For testing -django-nose==1.4.4 -coverage==4.0.3 - -# Registrasion -https://github.com/chrisjrn/registrasion/tarball/master -https://github.com/chrisjrn/symposion/tarball/northbaypython -https://github.com/chrisjrn/registrasion-stripe/tarball/master -https://github.com/chrisjrn/symposion-bootstrap-templates/tarball/master diff --git a/requirements/heroku.txt b/requirements/heroku.txt deleted file mode 100644 index 006e01ac224861618d63dbe9246a3d7a70f4dd38..0000000000000000000000000000000000000000 --- a/requirements/heroku.txt +++ /dev/null @@ -1,2 +0,0 @@ -psycopg2==2.7.3 -gunicorn==19.7.1 diff --git a/setup.txt b/setup.txt new file mode 100644 index 0000000000000000000000000000000000000000..b6b2d4e43322155e14c778cf9a04f4e3cc4320a1 --- /dev/null +++ b/setup.txt @@ -0,0 +1,26 @@ +Django>=1.10,<1.12 + +# These versions are pinned to support Django 1.10 +django-storages<1.6.6 +django-timezone-field>=2.1,<3.0 +pinax-eventlog<2.0 + +# Registrasion +https://github.com/chrisjrn/registrasion/tarball/master +https://github.com/chrisjrn/symposion/tarball/northbaypython +https://github.com/chrisjrn/registrasion-stripe/tarball/master +https://github.com/chrisjrn/symposion-bootstrap-templates/tarball/master + +pinax-theme-bootstrap +django-user-accounts +dj-static +dj-database-url +pinax-pages +pinax-boxes +django-libsass +django-markdown-deux +django-sitetree +django-countries +easy-thumbnails +django-model-utils +django-email-log