Django 1.9

diff --git a/chunks/migrations/0002_auto_20190925_1136.py b/chunks/migrations/0002_auto_20190925_1136.py
new file mode 100644 (file)
index 0000000..df2596e
--- /dev/null
+++ b/chunks/migrations/0002_auto_20190925_1136.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('chunks', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='chunk',
+            options={'ordering': ('key',), 'verbose_name': 'chunk', 'verbose_name_plural': 'chunks'},
+        ),
+        migrations.AlterField(
+            model_name='chunk',
+            name='content_en_markup_type',
+            field=models.CharField(default=b'textile_pl', max_length=30, editable=False, choices=[(b'', b'--'), (b'textile_pl', b'textile_pl')]),
+        ),
+        migrations.AlterField(
+            model_name='chunk',
+            name='content_pl_markup_type',
+            field=models.CharField(default=b'textile_pl', max_length=30, editable=False, choices=[(b'', b'--'), (b'textile_pl', b'textile_pl')]),
+        ),
+        migrations.AlterField(
+            model_name='chunk',
+            name='key',
+            field=models.CharField(help_text='A unique name for this chunk of content', max_length=255, serialize=False, verbose_name='key', primary_key=True),
+        ),
+    ]

diff --git a/contact/admin.py b/contact/admin.py
index 90bd60d..8637449 100644 (file)
--- a/contact/admin.py
+++ b/contact/admin.py
@@ -5,7 +5,7 @@ from django.utils.translation import ugettext as _
 from .forms import contact_forms, admin_list_width
 from django.template import Template
 from django.utils.safestring import mark_safe
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from django.http import HttpResponse, Http404
 
 from .utils import deunicode
@@ -106,9 +106,9 @@ class ContactAdmin(admin.ModelAdmin):
 
     def get_urls(self):
         urls = super(ContactAdmin, self).get_urls()
-        return patterns('',
+        return [
             url(r'^extract/(?P<form_tag>[\w-]+)/(?P<extract_type_slug>[\w-]+)/$', self.admin_site.admin_view(extract_view), name='contact_extract')
-        ) + super(ContactAdmin, self).get_urls()
+        ] + super(ContactAdmin, self).get_urls()
 
 
 def extract_view(request, form_tag, extract_type_slug):

diff --git a/contact/migrations/0002_auto_20190925_1137.py b/contact/migrations/0002_auto_20190925_1137.py
new file mode 100644 (file)
index 0000000..f79bcd1
--- /dev/null
+++ b/contact/migrations/0002_auto_20190925_1137.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contact', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contact',
+            name='ip',
+            field=models.GenericIPAddressField(default=b'127.0.0.1', verbose_name='IP address'),
+        ),
+    ]

diff --git a/contact/models.py b/contact/models.py
index 37096ae..a97400f 100644 (file)
--- a/contact/models.py
+++ b/contact/models.py
@@ -10,7 +10,7 @@ from . import app_settings
 
 class Contact(models.Model):
     created_at = models.DateTimeField(_('submission date'), auto_now_add=True)
-    ip = models.IPAddressField(_('IP address'), default='127.0.0.1')
+    ip = models.GenericIPAddressField(_('IP address'), default='127.0.0.1')
     contact = models.CharField(_('contact'), max_length=128)
     form_tag = models.CharField(_('form'), max_length=32, db_index=True)
     body = JSONField(_('body'))

diff --git a/contact/urls.py b/contact/urls.py
index edc4954..0888583 100644 (file)
--- a/contact/urls.py
+++ b/contact/urls.py
@@ -1,10 +1,10 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from . import views
 
-urlpatterns = patterns('contact.views',
+urlpatterns = [
     url(r'^(?P<form_tag>[^/]+)/$', views.form, name='contact_form'),
     url(r'^(?P<form_tag>[^/]+)/thanks/$', views.thanks, name='contact_thanks'),
     url(r'^attachment/(?P<contact_id>\d+)/(?P<tag>[^/]+)/$',
             views.attachment, name='contact_attachment'),
     url(r'^(?P<form_tag>[^/]+)/(?P<key>[^/]{30})/$', views.form, name='contact_form_key'),
-)
+]

diff --git a/contact/widgets.py b/contact/widgets.py
index 738ae04..2d34b7f 100644 (file)
--- a/contact/widgets.py
+++ b/contact/widgets.py
@@ -1,5 +1,5 @@
 from django import forms
-from django.forms.util import flatatt
+from django.forms.utils import flatatt
 from django.utils.html import format_html
 
 class HeaderWidget(forms.widgets.Widget):

diff --git a/prawokultury/settings.d/20-basic.py b/prawokultury/settings.d/20-basic.py
index 0d126cc..0409be1 100644 (file)
--- a/prawokultury/settings.d/20-basic.py
+++ b/prawokultury/settings.d/20-basic.py
@@ -1,5 +1,4 @@
 DEBUG = False
-TEMPLATE_DEBUG = DEBUG
 
 DATABASES = {
     'default': {
@@ -14,20 +13,27 @@ DATABASES = {
 
 SITE_ID = 1
 
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-)
-
 ROOT_URLCONF = 'prawokultury.urls'
 
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'APP_DIRS': True,
+        'OPTIONS': {
+            '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',
+                'prawokultury.context_processors.registration_url',
+            ],
+        },
+    },
+]
+
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'prawokultury.wsgi.application'
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)

diff --git a/prawokultury/settings.d/40-context.py b/prawokultury/settings.d/40-context.py
deleted file mode 100644 (file)
index 90231de..0000000
--- a/prawokultury/settings.d/40-context.py
+++ /dev/null
@@ -1,11 +0,0 @@
-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',
-    'prawokultury.context_processors.registration_url',
-)

diff --git a/prawokultury/settings.d/50-static.py b/prawokultury/settings.d/50-static.py
index 893848a..4a47f9f 100644 (file)
--- a/prawokultury/settings.d/50-static.py
+++ b/prawokultury/settings.d/50-static.py
@@ -10,43 +10,43 @@ STATICFILES_FINDERS = (
 )
 
 STATICFILES_STORAGE = 'fnpdjango.pipeline_storage.GzipPipelineCachedStorage'
-PIPELINE_CSS_COMPRESSOR = None
-PIPELINE_JS_COMPRESSOR = None
-PIPELINE_CSS = {
-    'base': {
-        'source_filenames': (
-          'css/base.scss',
-          'css/layout.scss',
-          'css/header.scss',
-          'css/menu.scss',
-          'css/search.scss',
-          'css/sidebar.scss',
-          'css/promobox.scss',
-          'css/entry.scss',
-          'css/footer.scss',
-          'css/prevnext.scss',
-          'css/forms.scss',
-          'events/events.scss',
 
-          'contrib/lightbox/css/lightbox.css',
-        ),
-        'output_filename': 'compressed/base.css',
+PIPELINE = {
+    'CSS_COMPRESSOR': None,
+    'JS_COMPRESSOR': None,
+    'STYLESHEETS': {
+        'base': {
+            'source_filenames': (
+                'css/base.scss',
+                'css/layout.scss',
+                'css/header.scss',
+                'css/menu.scss',
+                'css/search.scss',
+                'css/sidebar.scss',
+                'css/promobox.scss',
+                'css/entry.scss',
+                'css/footer.scss',
+                'css/prevnext.scss',
+                'css/forms.scss',
+                'events/events.scss',
+
+                'contrib/lightbox/css/lightbox.css',
+            ),
+            'output_filename': 'compressed/base.css',
+        },
     },
-}
-PIPELINE_JS = {
-    'base': {
-        'source_filenames': (
-            'js/promobox.js',
-            'js/workshop_form.js',
-            'js/optional_fields.js',
-            'contrib/lightbox/js/lightbox.min.js',
-        ),
-        'output_filename': 'compressed/base.js',
+    'JAVASCRIPT': {
+        'base': {
+            'source_filenames': (
+                'js/promobox.js',
+                'js/workshop_form.js',
+                'js/optional_fields.js',
+                'contrib/lightbox/js/lightbox.min.js',
+            ),
+            'output_filename': 'compressed/base.js',
+        },
     },
+    'COMPILERS': (
+        'pipeline.compilers.sass.SASSCompiler',
+    ),
 }
-
-PIPELINE_COMPILERS = (
-  'pipeline.compilers.sass.SASSCompiler',
-)
-
-PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage'

diff --git a/prawokultury/settings.d/60-custom.py b/prawokultury/settings.d/60-custom.py
index 87e1d91..9b7a4da 100644 (file)
--- a/prawokultury/settings.d/60-custom.py
+++ b/prawokultury/settings.d/60-custom.py
@@ -1,8 +1,7 @@
-from fnpdjango.utils.settings import LazyUGettextLazy as gettext
 from migdal.helpers import EntryType
 
 MIGDAL_TYPES = (
-    EntryType('info', gettext('info'), commentable=False, on_main=False),
+    EntryType('info', 'info', commentable=False, on_main=False),
 )
 
 MIGDAL_TAXONOMIES = ()

diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html
index 189a732..f582c06 100755 (executable)
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -3,14 +3,14 @@
 {% load static from staticfiles %}
 {% load fnp_common migdal_tags fnp_share fnp_lang menu_tags %}
 {% load sponsor_tags %}
-{% load compressed %}
+{% load pipeline %}
 {% load piwik_tags %}
 {% load entry_url %}
 <html prefix="og: http://ogp.me/ns#">
     <head>
        <title>{% block titleextra %}{% endblock %}CopyCamp</title>
        <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
-        {% compressed_css 'base' %}
+        {% stylesheet 'base' %}
 
         <meta charset="UTF-8" />
         <meta property='og:url' content='{% block ogurl %}{{ request.get_full_path|build_absolute_uri:request }}{% endblock %}' />
@@ -112,7 +112,7 @@
 
     </div>
     <script type="text/javascript" src="//code.jquery.com/jquery-1.8.0.min.js" charset="utf-8"></script>
-    {% compressed_js 'base' %}
+    {% javascript 'base' %}
     {% tracking_code %}
     </body>
 </html>

diff --git a/prawokultury/urls.py b/prawokultury/urls.py
index 734ca7c..57697ef 100644 (file)
--- a/prawokultury/urls.py
+++ b/prawokultury/urls.py
@@ -3,34 +3,31 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.conf import settings
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.utils.translation import ugettext_lazy as _, string_concat
+import django_cas.views
 from fnpdjango.utils.urls import i18n_patterns
 from migdal.urls import urlpatterns as migdal_urlpatterns
 
-admin.autodiscover()
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
-            'document_root': settings.MEDIA_ROOT,
-        }),
-
-    (r'^accounts/login/$', 'django_cas.views.login'),
-    (r'^accounts/logout/$', 'django_cas.views.logout'),
-) + i18n_patterns(
+    url(r'^accounts/login/$', django_cas.views.login),
+    url(r'^accounts/logout/$', django_cas.views.logout),
+] + i18n_patterns(
     url(r'^comments/', include('django_comments_xtd.urls')),
     url(r'^contact/', include('contact.urls')),
 ) + migdal_urlpatterns 
 
 if settings.DEBUG:
-    urlpatterns += patterns('',
-        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+    import django.views.static
+    urlpatterns += [
+        url(r'^media/(?P<path>.*)$', django.views.static.serve, {
             'document_root': settings.MEDIA_ROOT,
         }),
-   )
+   ]
 
 urlpatterns += staticfiles_urlpatterns()

diff --git a/requirements.txt b/requirements.txt
index 3b6a21c..eaf038f 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,21 +1,21 @@
 -i https://py.mdrn.pl/simple
 
-Django>=1.7,<1.8
+Django>=1.9,<1.10
 fnpdjango==0.3
 django_cas>=2.1,<2.2
 Pillow
-sorl-thumbnail==12.2
+sorl-thumbnail==12.4.1
 django-pagination
-django-migdal==0.8.5
+django-migdal==0.8.6
 pytz
 
 jsonfield==1.0.3
 
 django-markupfield==1.4.3
 django-gravatar2
-django-comments-xtd==1.4.0 # for migdal
-django-contrib-comments==1.6.0 # for migdal
-django-pipeline>=1.3.23,<1.4
+django-comments-xtd==1.5.1 # for migdal
+django-contrib-comments==1.7.3 # for migdal
+django-pipeline==1.6.14
 django-extensions
 six
 
@@ -23,7 +23,7 @@ six
 #git+git://github.com/Kronuz/pyScss.git@d8f4da23a3c87696a75b3830ed4ab49b75550a93#egg=pyScss
 #TODO: pyScss support, for now just install sass
 
-django-haystack>=2.1,<2.2
+django-haystack==2.7.0
 pysolr
 django-piwik