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
...
 
@@ -12,14 +12,12 @@ DATABASES = {
 
    "default": {
 
        "ENGINE": "django.db.backends.sqlite3",
 
        "NAME": os.path.join(PROJECT_ROOT, "dev.db"),
 
    }
 
}
 

	
 
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()
 
DATABASES['default'].update(db_from_env)
 

	
 
ALLOWED_HOSTS = [".localhost", ".herokuapp.com", ".northbaypython.org", "127.0.0.1"]
...
 
@@ -46,17 +44,12 @@ TIME_ZONE = os.environ.get("TZ", "America/Los_Angeles")
 

	
 
# Set the email address that will receive errors.
 
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"
 

	
 
SITE_ID = int(os.environ.get("SITE_ID", 1))
 

	
...
 
@@ -100,20 +93,12 @@ STATICFILES_DIRS = (
 
STATICFILES_FINDERS = [
 
    "django.contrib.staticfiles.finders.FileSystemFinder",
 
    "django.contrib.staticfiles.finders.AppDirectoriesFinder",
 
    "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(&#2i5mq_^%%@ihu_qxxotl_"
 

	
 
TEMPLATES = [
 
    {
 
        "BACKEND": "django.template.backends.django.DjangoTemplates",
...
 
@@ -132,13 +117,12 @@ TEMPLATES = [
 
                "django.template.context_processors.tz",
 
                "django.template.context_processors.request",
 
                "django.contrib.messages.context_processors.messages",
 
                "account.context_processors.account",
 
                "pinax_theme_bootstrap.context_processors.theme",
 
                "symposion.reviews.context_processors.reviews",
 
                "sekizai.context_processors.sekizai",
 
            ],
 
        },
 
    },
 
]
 

	
 
TEMPLATE_DEBUG = False
...
 
@@ -149,15 +133,12 @@ MIDDLEWARE_CLASSES = [
 
    "django.middleware.csrf.CsrfViewMiddleware",
 
    "django.contrib.auth.middleware.AuthenticationMiddleware",
 
    "django.contrib.auth.middleware.SessionAuthenticationMiddleware",
 
    "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",
 
]
 

	
 
ROOT_URLCONF = "pinaxcon.urls"
 

	
 
# Python dotted path to the WSGI application used by Django's runserver.
...
 
@@ -178,13 +159,12 @@ INSTALLED_APPS = [
 

	
 
    # external
 
    "account",
 
    "easy_thumbnails",
 
    "taggit",
 
    "reversion",
 
    "metron",
 
    "sitetree",
 
    "pinax.boxes",
 
    "pinax.eventlog",
 
    "pinax.pages",
 
    "markdown_deux",
 

	
...
 
@@ -212,27 +192,12 @@ INSTALLED_APPS = [
 

	
 
    # project
 
    "pinaxcon",
 
    "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',
 

	
 
    'email_log',
 
]
 

	
...
 
@@ -325,32 +290,14 @@ ATTENDEE_PROFILE_MODEL = "pinaxcon.registrasion.models.AttendeeProfile"
 
# ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm"
 

	
 
# Ticket product category -- used to identify which products must be available
 
# 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,
 
        "extras": {
 
            "tables": 1,
 
        }
pinaxcon/templates/site_base.html
Show inline comments
 
{% extends "override_bootstrap_theme_base.html" %}
 

	
 
{% load staticfiles %}
 
{% load metron_tags %}
 
{% load i18n %}
 
{% load sitetree %}
 

	
 
{% block styles %}
 
    {% include "_styles.html" %}
 
{% endblock %}
...
 
@@ -75,9 +74,8 @@
 
    {% block extra_script %}
 
    {% endblock %}
 

	
 
{% endblock %}
 

	
 
{% block extra_body_base %}
 
    {% analytics %}
 
    {% block extra_body %}{% endblock %}
 
{% endblock %}
pinaxcon/urls.py
Show inline comments
 
from django.conf import settings
 
from django.conf.urls import include, url
 
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
 

	
 
from pinaxcon import views
 

	
 
import symposion.views
...
 
@@ -97,15 +95,12 @@ urlpatterns = [
 
    url(r"^tickets/payments/", include("registripe.urls")),
 

	
 
    # Required by registrasion
 
    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")),
 
]
 

	
 

	
 
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
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)