Merge pull request #73 from satnogs/requires-io-dev
[requires.io] dependency update on dev branch
This commit is contained in:
commit
f7695d19da
|
@ -6,8 +6,15 @@ SatNOGS DB is a transmitter suggestions and crowd-sourcing app.
|
||||||
|
|
||||||
See the [documentation](http://docs.satnogs.org/db/).
|
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
|
## License
|
||||||
|
|
||||||
© 2014-2015 [Libre Space Foundation](http://librespacefoundation.org).
|
© 2014-2016 [Libre Space Foundation](http://librespacefoundation.org).
|
||||||
|
|
||||||
Licensed under the [AGPLv3](LICENSE).
|
Licensed under the [AGPLv3](LICENSE).
|
||||||
|
|
|
@ -10,7 +10,4 @@ router.register(r'modes', views.ModeView)
|
||||||
router.register(r'satellites', views.SatelliteView)
|
router.register(r'satellites', views.SatelliteView)
|
||||||
router.register(r'transmitters', views.TransmitterView)
|
router.register(r'transmitters', views.TransmitterView)
|
||||||
|
|
||||||
urlpatterns = patterns(
|
api_urlpatterns = router.urls
|
||||||
'',
|
|
||||||
url(r'^', include(router.urls))
|
|
||||||
)
|
|
||||||
|
|
|
@ -1,11 +1,13 @@
|
||||||
from django.conf.urls import patterns, url
|
from django.conf.urls import patterns, url
|
||||||
|
|
||||||
urlpatterns = patterns(
|
from db.base import views
|
||||||
'db.base.views',
|
|
||||||
url(r'^$', 'home', name='home'),
|
|
||||||
url(r'^about/$', 'about', name='about'),
|
base_urlpatterns = ([
|
||||||
url(r'^faq/$', 'faq', name='faq'),
|
url(r'^$', views.home, name='home'),
|
||||||
url(r'^satellite/(?P<norad>[0-9]+)/$', 'satellite', name='satellite'),
|
url(r'^about/$', views.about, name='about'),
|
||||||
url(r'^suggestion/$', 'suggestion', name='suggestion'),
|
url(r'^faq/$', views.faq, name='faq'),
|
||||||
url(r'^robots\.txt$', 'robots', name='robots'),
|
url(r'^satellite/(?P<norad>[0-9]+)/$', views.satellite, name='satellite'),
|
||||||
)
|
url(r'^suggestion/$', views.suggestion, name='suggestion'),
|
||||||
|
url(r'^robots\.txt$', views.robots, name='robots'),
|
||||||
|
])
|
||||||
|
|
|
@ -61,28 +61,32 @@ USE_L10N = True
|
||||||
USE_TZ = True
|
USE_TZ = True
|
||||||
|
|
||||||
# Templates
|
# Templates
|
||||||
TEMPLATE_CONTEXT_PROCESSORS = (
|
TEMPLATES = [
|
||||||
'django.contrib.auth.context_processors.auth',
|
{
|
||||||
'django.core.context_processors.debug',
|
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||||
'django.core.context_processors.i18n',
|
'DIRS': [path.join(BASE_DIR, 'templates')],
|
||||||
'django.core.context_processors.media',
|
'OPTIONS': {
|
||||||
'django.core.context_processors.static',
|
'debug': False,
|
||||||
'django.core.context_processors.tz',
|
'context_processors': [
|
||||||
'django.contrib.messages.context_processors.messages',
|
'django.contrib.auth.context_processors.auth',
|
||||||
'django.core.context_processors.request',
|
'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 & Media
|
||||||
STATIC_ROOT = path.join(path.dirname(BASE_DIR), 'staticfiles')
|
STATIC_ROOT = path.join(path.dirname(BASE_DIR), 'staticfiles')
|
||||||
|
|
|
@ -4,7 +4,6 @@ ENVIRONMENT = 'dev'
|
||||||
|
|
||||||
# Debug
|
# Debug
|
||||||
DEBUG = True
|
DEBUG = True
|
||||||
TEMPLATE_DEBUG = DEBUG
|
|
||||||
MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
|
MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
|
||||||
'debug_toolbar.middleware.DebugToolbarMiddleware',
|
'debug_toolbar.middleware.DebugToolbarMiddleware',
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{% extends "account/base.html" %}
|
{% extends "account/base.html" %}
|
||||||
|
|
||||||
{% load url from future %}
|
|
||||||
{% load crispy_forms_tags %}
|
{% load crispy_forms_tags %}
|
||||||
|
|
||||||
{% block head_title %} - Account{% endblock %}
|
{% block head_title %} - Account{% endblock %}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{% extends "account/base.html" %}
|
{% extends "account/base.html" %}
|
||||||
|
|
||||||
{% load url from future %}
|
|
||||||
{% load account %}
|
{% load account %}
|
||||||
|
|
||||||
{% block head_title %} - Confirm E-mail Address{% endblock %}
|
{% block head_title %} - Confirm E-mail Address{% endblock %}
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{% extends "account/base.html" %}
|
{% extends "account/base.html" %}
|
||||||
|
|
||||||
{% load account %}
|
{% load account %}
|
||||||
{% load url from future %}
|
|
||||||
{% load crispy_forms_tags %}
|
{% load crispy_forms_tags %}
|
||||||
|
|
||||||
{% block head_title %} - Sign In{% endblock %}
|
{% block head_title %} - Sign In{% endblock %}
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
{% extends "account/base.html" %}
|
{% extends "account/base.html" %}
|
||||||
|
|
||||||
{% load url from future %}
|
|
||||||
|
|
||||||
{% block head_title %} - Sign Out{% endblock %}
|
{% block head_title %} - Sign Out{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{% extends "account/base.html" %}
|
{% extends "account/base.html" %}
|
||||||
|
|
||||||
{% load url from future %}
|
|
||||||
{% load crispy_forms_tags %}
|
{% load crispy_forms_tags %}
|
||||||
|
|
||||||
{% block head_title %} - Change Password{% endblock %}
|
{% block head_title %} - Change Password{% endblock %}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{% extends "account/base.html" %}
|
{% extends "account/base.html" %}
|
||||||
|
|
||||||
{% load url from future %}
|
|
||||||
{% block head_title %} - Change Password{% endblock %}
|
{% block head_title %} - Change Password{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
{% extends "account/base.html" %}
|
{% extends "account/base.html" %}
|
||||||
|
|
||||||
{% load crispy_forms_tags %}
|
{% load crispy_forms_tags %}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{% extends "account/base.html" %}
|
{% extends "account/base.html" %}
|
||||||
|
|
||||||
{% load url from future %}
|
|
||||||
{% load crispy_forms_tags %}
|
{% load crispy_forms_tags %}
|
||||||
|
|
||||||
{% block title %} - Sign Up{% endblock title %}
|
{% block title %} - Sign Up{% endblock title %}
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
{% extends "account/base.html" %}
|
{% extends "account/base.html" %}
|
||||||
|
|
||||||
{% load url from future %}
|
|
||||||
|
|
||||||
{% block head_title %} - Invitation only Sign Ups{% endblock %}
|
{% block head_title %} - Invitation only Sign Ups{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{% extends "account/base.html" %}
|
{% extends "account/base.html" %}
|
||||||
|
|
||||||
|
|
||||||
{% block head_title %} - Verify Your E-mail Address{% endblock %}
|
{% block head_title %} - Verify Your E-mail Address{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
{% extends "account/base.html" %}
|
{% extends "account/base.html" %}
|
||||||
|
|
||||||
{% load url from future %}
|
|
||||||
|
|
||||||
{% block head_title %} - Verify Your E-mail Address{% endblock %}
|
{% block head_title %} - Verify Your E-mail Address{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
31
db/urls.py
31
db/urls.py
|
@ -1,33 +1,32 @@
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.conf.urls import patterns, include, url
|
from django.conf.urls import patterns, include, url
|
||||||
|
|
||||||
from django.contrib import admin
|
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'
|
handler404 = 'db.base.views.custom_404'
|
||||||
handler500 = 'db.base.views.custom_500'
|
handler500 = 'db.base.views.custom_500'
|
||||||
|
|
||||||
urlpatterns = patterns(
|
urlpatterns = [
|
||||||
'',
|
|
||||||
|
|
||||||
# Base
|
# Base
|
||||||
url(r'^', include('db.base.urls')),
|
url(r'^', include(base_urlpatterns)),
|
||||||
|
|
||||||
# Accounts
|
# Accounts
|
||||||
url(r'^accounts/', include('allauth.urls')),
|
url(r'^accounts/', include(allauth_urls)),
|
||||||
|
|
||||||
# API
|
# API
|
||||||
url(r'^api/', include('db.api.urls')),
|
url(r'^api/', include(api_urlpatterns)),
|
||||||
|
|
||||||
# Admin
|
# Admin
|
||||||
url(r'^admin/', include(admin.site.urls)),
|
url(r'^admin/', admin.site.urls),
|
||||||
)
|
]
|
||||||
|
|
||||||
if settings.DEBUG:
|
if settings.DEBUG:
|
||||||
urlpatterns += patterns(
|
urlpatterns += [
|
||||||
'',
|
url(r'^media/(?P<path>.*)$', serve,
|
||||||
url(r'^404/$', handler404),
|
|
||||||
url(r'^500/$', handler500),
|
|
||||||
url(r'^media/(?P<path>.*)$', 'django.views.static.serve',
|
|
||||||
{'document_root': settings.MEDIA_ROOT}),
|
{'document_root': settings.MEDIA_ROOT}),
|
||||||
)
|
]
|
||||||
|
|
|
@ -1,28 +1,28 @@
|
||||||
# Basic stuff
|
# Basic stuff
|
||||||
django==1.8.7
|
django==1.9.2
|
||||||
django-shortuuidfield==0.1.2
|
django-shortuuidfield==0.1.3
|
||||||
django_compressor==1.5
|
django-compressor==2.0
|
||||||
|
|
||||||
# Configuration
|
# Configuration
|
||||||
django_dotenv==1.3.0
|
django-dotenv==1.4.1
|
||||||
dj-database-url==0.3.0
|
dj-database-url==0.4.0
|
||||||
opbeat==3.0.1
|
opbeat==3.2.1
|
||||||
|
|
||||||
# Security
|
# Security
|
||||||
django-braces==1.4.0
|
django-braces==1.8.1
|
||||||
django-secure==1.0.1
|
django-secure==1.0.1
|
||||||
|
|
||||||
# Users
|
# Users
|
||||||
django-allauth==0.20.0
|
django-allauth==0.24.1
|
||||||
django-crispy-forms==1.4.0
|
django-crispy-forms==1.6.0
|
||||||
|
|
||||||
# Images
|
# Images
|
||||||
Pillow==2.9.0
|
Pillow==3.1.1
|
||||||
|
|
||||||
# API
|
# API
|
||||||
djangorestframework==3.1.1
|
djangorestframework==3.3.2
|
||||||
markdown==2.6.1
|
markdown==2.6.5
|
||||||
django-filter==0.9.2
|
django-filter==0.12.0
|
||||||
|
|
||||||
# Astronomy
|
# Astronomy
|
||||||
orbit==0.2
|
orbit==0.2
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
-r base.txt
|
-r base.txt
|
||||||
|
|
||||||
# Debug & Testing
|
# Debug & Testing
|
||||||
django-debug-toolbar==1.3.0
|
django-debug-toolbar==1.4
|
||||||
sqlparse==0.1.14
|
sqlparse==0.1.18
|
||||||
factory_boy==2.5.1
|
factory-boy==2.6.0
|
||||||
flake8==2.4.0
|
flake8==2.5.2
|
||||||
|
|
|
@ -2,4 +2,4 @@
|
||||||
-r dev.txt
|
-r dev.txt
|
||||||
|
|
||||||
MySQL-python==1.2.5
|
MySQL-python==1.2.5
|
||||||
gunicorn==19.3.0
|
gunicorn==19.4.5
|
||||||
|
|
|
@ -2,4 +2,4 @@
|
||||||
-r base.txt
|
-r base.txt
|
||||||
|
|
||||||
MySQL-python==1.2.5
|
MySQL-python==1.2.5
|
||||||
gunicorn==19.3.0
|
gunicorn==19.4.5
|
||||||
|
|
Loading…
Reference in a new issue