diff --git a/README.md b/README.md index ea8ebd3..a3acca0 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,15 @@ SatNOGS DB is a transmitter suggestions and crowd-sourcing app. See the [documentation](http://docs.satnogs.org/db/). +## Current Development + +You can take a look for the current status of development issues at our [Kanban board](https://huboard.com/satnogs/satnogs-db). + +[![Requirements Status](https://requires.io/github/satnogs/satnogs-db/requirements.svg?branch=dev)](https://requires.io/github/satnogs/satnogs-db/requirements/?branch=dev) + + ## License -© 2014-2015 [Libre Space Foundation](http://librespacefoundation.org). +© 2014-2016 [Libre Space Foundation](http://librespacefoundation.org). Licensed under the [AGPLv3](LICENSE). diff --git a/db/api/urls.py b/db/api/urls.py index 6539636..8d99b11 100644 --- a/db/api/urls.py +++ b/db/api/urls.py @@ -10,7 +10,4 @@ router.register(r'modes', views.ModeView) router.register(r'satellites', views.SatelliteView) router.register(r'transmitters', views.TransmitterView) -urlpatterns = patterns( - '', - url(r'^', include(router.urls)) -) +api_urlpatterns = router.urls diff --git a/db/base/urls.py b/db/base/urls.py index 0877e41..6f41f5f 100644 --- a/db/base/urls.py +++ b/db/base/urls.py @@ -1,11 +1,13 @@ from django.conf.urls import patterns, url -urlpatterns = patterns( - 'db.base.views', - url(r'^$', 'home', name='home'), - url(r'^about/$', 'about', name='about'), - url(r'^faq/$', 'faq', name='faq'), - url(r'^satellite/(?P[0-9]+)/$', 'satellite', name='satellite'), - url(r'^suggestion/$', 'suggestion', name='suggestion'), - url(r'^robots\.txt$', 'robots', name='robots'), -) +from db.base import views + + +base_urlpatterns = ([ + url(r'^$', views.home, name='home'), + url(r'^about/$', views.about, name='about'), + url(r'^faq/$', views.faq, name='faq'), + url(r'^satellite/(?P[0-9]+)/$', views.satellite, name='satellite'), + url(r'^suggestion/$', views.suggestion, name='suggestion'), + url(r'^robots\.txt$', views.robots, name='robots'), +]) diff --git a/db/settings/base.py b/db/settings/base.py index 7378e68..df3f20e 100644 --- a/db/settings/base.py +++ b/db/settings/base.py @@ -61,28 +61,32 @@ USE_L10N = True USE_TZ = True # Templates -TEMPLATE_CONTEXT_PROCESSORS = ( - 'django.contrib.auth.context_processors.auth', - 'django.core.context_processors.debug', - 'django.core.context_processors.i18n', - 'django.core.context_processors.media', - 'django.core.context_processors.static', - 'django.core.context_processors.tz', - 'django.contrib.messages.context_processors.messages', - 'django.core.context_processors.request', +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [path.join(BASE_DIR, 'templates')], + 'OPTIONS': { + 'debug': False, + 'context_processors': [ + 'django.contrib.auth.context_processors.auth', + 'django.template.context_processors.debug', + 'django.template.context_processors.i18n', + 'django.template.context_processors.media', + 'django.template.context_processors.static', + 'django.template.context_processors.tz', + 'django.contrib.messages.context_processors.messages', + 'django.template.context_processors.request', + 'db.base.context_processors.analytics', + 'db.base.context_processors.stage_notice', + ], + 'loaders': [ + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', + ], + }, - 'allauth.account.context_processors.account', - - 'db.base.context_processors.analytics', - 'db.base.context_processors.stage_notice', -) -TEMPLATE_DIRS = ( - path.join(BASE_DIR, 'templates'), -) -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', -) + }, +] # Static & Media STATIC_ROOT = path.join(path.dirname(BASE_DIR), 'staticfiles') diff --git a/db/settings/dev.py b/db/settings/dev.py index 373a29a..0b0e560 100644 --- a/db/settings/dev.py +++ b/db/settings/dev.py @@ -4,7 +4,6 @@ ENVIRONMENT = 'dev' # Debug DEBUG = True -TEMPLATE_DEBUG = DEBUG MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + ( 'debug_toolbar.middleware.DebugToolbarMiddleware', ) diff --git a/db/templates/account/email.html b/db/templates/account/email.html index 5602b62..bc38736 100644 --- a/db/templates/account/email.html +++ b/db/templates/account/email.html @@ -1,6 +1,5 @@ {% extends "account/base.html" %} -{% load url from future %} {% load crispy_forms_tags %} {% block head_title %} - Account{% endblock %} diff --git a/db/templates/account/email_confirm.html b/db/templates/account/email_confirm.html index 3a33da5..66f071f 100644 --- a/db/templates/account/email_confirm.html +++ b/db/templates/account/email_confirm.html @@ -1,6 +1,5 @@ {% extends "account/base.html" %} -{% load url from future %} {% load account %} {% block head_title %} - Confirm E-mail Address{% endblock %} diff --git a/db/templates/account/login.html b/db/templates/account/login.html index a38d4db..09b72e3 100644 --- a/db/templates/account/login.html +++ b/db/templates/account/login.html @@ -1,7 +1,6 @@ {% extends "account/base.html" %} {% load account %} -{% load url from future %} {% load crispy_forms_tags %} {% block head_title %} - Sign In{% endblock %} diff --git a/db/templates/account/logout.html b/db/templates/account/logout.html index ca8e442..2321725 100644 --- a/db/templates/account/logout.html +++ b/db/templates/account/logout.html @@ -1,7 +1,5 @@ {% extends "account/base.html" %} -{% load url from future %} - {% block head_title %} - Sign Out{% endblock %} {% block content %} diff --git a/db/templates/account/password_reset_from_key.html b/db/templates/account/password_reset_from_key.html index d9c0e21..30f8361 100644 --- a/db/templates/account/password_reset_from_key.html +++ b/db/templates/account/password_reset_from_key.html @@ -1,6 +1,5 @@ {% extends "account/base.html" %} -{% load url from future %} {% load crispy_forms_tags %} {% block head_title %} - Change Password{% endblock %} diff --git a/db/templates/account/password_reset_from_key_done.html b/db/templates/account/password_reset_from_key_done.html index 0651cb0..c74d39e 100644 --- a/db/templates/account/password_reset_from_key_done.html +++ b/db/templates/account/password_reset_from_key_done.html @@ -1,6 +1,5 @@ {% extends "account/base.html" %} -{% load url from future %} {% block head_title %} - Change Password{% endblock %} {% block content %} diff --git a/db/templates/account/password_set.html b/db/templates/account/password_set.html index 9b7aedf..116db77 100644 --- a/db/templates/account/password_set.html +++ b/db/templates/account/password_set.html @@ -1,4 +1,3 @@ - {% extends "account/base.html" %} {% load crispy_forms_tags %} diff --git a/db/templates/account/signup.html b/db/templates/account/signup.html index 953be6b..cf1b76c 100644 --- a/db/templates/account/signup.html +++ b/db/templates/account/signup.html @@ -1,6 +1,5 @@ {% extends "account/base.html" %} -{% load url from future %} {% load crispy_forms_tags %} {% block title %} - Sign Up{% endblock title %} diff --git a/db/templates/account/signup_closed.html b/db/templates/account/signup_closed.html index 0dcc9af..8277741 100644 --- a/db/templates/account/signup_closed.html +++ b/db/templates/account/signup_closed.html @@ -1,7 +1,5 @@ {% extends "account/base.html" %} -{% load url from future %} - {% block head_title %} - Invitation only Sign Ups{% endblock %} {% block content %} diff --git a/db/templates/account/verification_sent.html b/db/templates/account/verification_sent.html index 8e7285e..929795b 100644 --- a/db/templates/account/verification_sent.html +++ b/db/templates/account/verification_sent.html @@ -1,6 +1,5 @@ {% extends "account/base.html" %} - {% block head_title %} - Verify Your E-mail Address{% endblock %} {% block content %} diff --git a/db/templates/account/verified_email_required.html b/db/templates/account/verified_email_required.html index 59550d6..7da1e59 100644 --- a/db/templates/account/verified_email_required.html +++ b/db/templates/account/verified_email_required.html @@ -1,7 +1,5 @@ {% extends "account/base.html" %} -{% load url from future %} - {% block head_title %} - Verify Your E-mail Address{% endblock %} {% block content %} @@ -10,7 +8,7 @@

Verify Your E-mail Address

{% url 'account_email' as email_url %} - +

This part of the site requires us to verify that you are who you claim to be. For this purpose, we require that you verify ownership of your e-mail address.

diff --git a/db/urls.py b/db/urls.py index fcf9e54..743e8f6 100644 --- a/db/urls.py +++ b/db/urls.py @@ -1,33 +1,32 @@ from django.conf import settings from django.conf.urls import patterns, include, url - from django.contrib import admin -admin.autodiscover() +from django.views.static import serve + +from allauth import urls as allauth_urls + +from db.base.urls import base_urlpatterns +from db.api.urls import api_urlpatterns handler404 = 'db.base.views.custom_404' handler500 = 'db.base.views.custom_500' -urlpatterns = patterns( - '', - +urlpatterns = [ # Base - url(r'^', include('db.base.urls')), + url(r'^', include(base_urlpatterns)), # Accounts - url(r'^accounts/', include('allauth.urls')), + url(r'^accounts/', include(allauth_urls)), # API - url(r'^api/', include('db.api.urls')), + url(r'^api/', include(api_urlpatterns)), # Admin - url(r'^admin/', include(admin.site.urls)), -) + url(r'^admin/', admin.site.urls), +] if settings.DEBUG: - urlpatterns += patterns( - '', - url(r'^404/$', handler404), - url(r'^500/$', handler500), - url(r'^media/(?P.*)$', 'django.views.static.serve', + urlpatterns += [ + url(r'^media/(?P.*)$', serve, {'document_root': settings.MEDIA_ROOT}), - ) + ] diff --git a/requirements/base.txt b/requirements/base.txt index ba83b53..6274cdc 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,28 +1,28 @@ # Basic stuff -django==1.8.7 -django-shortuuidfield==0.1.2 -django_compressor==1.5 +django==1.9.2 +django-shortuuidfield==0.1.3 +django-compressor==2.0 # Configuration -django_dotenv==1.3.0 -dj-database-url==0.3.0 -opbeat==3.0.1 +django-dotenv==1.4.1 +dj-database-url==0.4.0 +opbeat==3.2.1 # Security -django-braces==1.4.0 +django-braces==1.8.1 django-secure==1.0.1 # Users -django-allauth==0.20.0 -django-crispy-forms==1.4.0 +django-allauth==0.24.1 +django-crispy-forms==1.6.0 # Images -Pillow==2.9.0 +Pillow==3.1.1 # API -djangorestframework==3.1.1 -markdown==2.6.1 -django-filter==0.9.2 +djangorestframework==3.3.2 +markdown==2.6.5 +django-filter==0.12.0 # Astronomy orbit==0.2 diff --git a/requirements/dev.txt b/requirements/dev.txt index 57fd0b9..5eed288 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -2,7 +2,7 @@ -r base.txt # Debug & Testing -django-debug-toolbar==1.3.0 -sqlparse==0.1.14 -factory_boy==2.5.1 -flake8==2.4.0 +django-debug-toolbar==1.4 +sqlparse==0.1.18 +factory-boy==2.6.0 +flake8==2.5.2 diff --git a/requirements/docker.txt b/requirements/docker.txt index 280cc88..b50a4ba 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -2,4 +2,4 @@ -r dev.txt MySQL-python==1.2.5 -gunicorn==19.3.0 +gunicorn==19.4.5 diff --git a/requirements/production.txt b/requirements/production.txt index ab9a788..75686ce 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -2,4 +2,4 @@ -r base.txt MySQL-python==1.2.5 -gunicorn==19.3.0 +gunicorn==19.4.5