Changeset - 0eff007ca0ff
[Not reviewed]
3 3 1
Brett Smith - 5 years ago 2018-10-04 20:14:17
brettcsmith@brettcsmith.org
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.
7 files changed with 26 insertions and 95 deletions:
0 comments (0 inline, 0 general)
pinaxcon/settings.py
Show inline comments
...
 
@@ -17,4 +17,2 @@ DATABASES = {
 

	
 
UNPREPEND_WWW = bool(int(os.environ.get("DJANGO_UNPREPEND_WWW", "0")))
 

	
 
# HEROKU: Update database configuration with $DATABASE_URL.
...
 
@@ -51,7 +49,2 @@ if admin_email is not None:
 

	
 

	
 
# 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:
...
 
@@ -105,10 +98,2 @@ STATICFILES_FINDERS = [
 

	
 

	
 
# 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.
...
 
@@ -137,3 +122,2 @@ TEMPLATES = [
 
                "symposion.reviews.context_processors.reviews",
 
                "sekizai.context_processors.sekizai",
 
            ],
...
 
@@ -154,5 +138,2 @@ MIDDLEWARE_CLASSES = [
 
    "django.middleware.clickjacking.XFrameOptionsMiddleware",
 
    "ssl_redirect.middleware.SSLRedirectMiddleware",
 
    "pinaxcon.middleware.CanonicalHostMiddleware",
 
    "pinaxcon.middleware.UnprependWWWMiddleware",
 
    "pinaxcon.monkey_patch.MonkeyPatchMiddleware",
...
 
@@ -183,3 +164,2 @@ INSTALLED_APPS = [
 
    "reversion",
 
    "metron",
 
    "sitetree",
...
 
@@ -217,17 +197,2 @@ INSTALLED_APPS = [
 

	
 
    #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
...
 
@@ -330,22 +295,4 @@ 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 = {
pinaxcon/templates/site_base.html
Show inline comments
...
 
@@ -3,3 +3,2 @@
 
{% load staticfiles %}
 
{% load metron_tags %}
 
{% load i18n %}
...
 
@@ -80,3 +79,2 @@
 
{% block extra_body_base %}
 
    {% analytics %}
 
    {% block extra_body %}{% endblock %}
pinaxcon/urls.py
Show inline comments
...
 
@@ -6,4 +6,2 @@ 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
 

	
...
 
@@ -102,5 +100,2 @@ urlpatterns = [
 

	
 
    url(r'^wiki/notifications/', get_nyt_pattern()),
 
    url(r'^wiki/', get_wiki_pattern())
 

	
 
    # Catch-all MUST go last.
requirements.txt
Show inline comments
 
deleted file
requirements/base.txt
Show inline comments
 
deleted file
requirements/heroku.txt
Show inline comments
 
deleted file
setup.txt
Show inline comments
 
new file 100644
 
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
0 comments (0 inline, 0 general)