Fedora 22 compatibility

Author: Jakub Dorňák

README.md

@@ -4,16 +4,43 @@ softwarecollections
 Software Collections Management Website
 
 
+Date migration from Django-1.6.x (Fedora-20) to Django-1.8.x (Fedora 22)
+-------------------------------------------------------------------
+
+1. With Django 1.6.x dump the data:
+
+    softwarecollections dumpdata scls tagging auth.user > data.json
+
+2. Remove the database and upgrade the system or move data.json to the new system.
+
+3. Check the new id of ContentType SoftwareCollection:
+
+    softwarecollections shell
+    >>> from django.contrib.contenttypes.models import ContentType
+    >>> ContentType.objects.get(app_label='scls', model='softwarecollection').id
+    2
+
+4. Fix the id in data.json:
+
+    sed -i -r 's/"content_type": [0-9]+,/"content_type": 2,/g' data.json
+
+5. Load updated data:
+
+    softwarecollections loaddata data.json
+
+Voilà!
+
+
 Installation
 ------------
 
 Enable yum repository from copr:
 
-    sudo wget -O /etc/yum.repos.d/SoftwareCollections.repo http://copr-fe.cloud.fedoraproject.org/coprs/mstuchli/SoftwareCollections/repo/fedora-20-x86_64/
+    sudo dnf copr enable jdornak/SoftwareCollections
 
 Install package softwarecollections:
 
-    sudo yum -y install softwarecollections
+    sudo dnf install softwarecollections
 
 
 Configuration (production instance)
@@ -27,7 +54,7 @@ Check the configuration in config files:
 If you have changed the configuration of database connection
 (which is recommended for production), initialize the database with:
 
-    sudo softwarecollections syncdb --migrate --noinput
+    sudo softwarecollections migrate
 
 
 Development instance
@@ -56,8 +83,7 @@ Create local configuration:
 
 Initialize development database:
 
-    ./manage.py syncdb --all
-    ./manage.py migrate --fake
+    ./manage.py migrate
 
 Run development server:
 
@@ -77,7 +103,7 @@ first make Yourself a superuser:
 To update your code and database to the last available version run:
 
     git pull --rebase
-    ./manage.py syncdb --migrate --noinput
+    ./manage.py migrate
 
 You may also need to install some new requirements (see the spec file).
 
@@ -104,10 +130,8 @@ Help
 ----
 
 If this is Your first time working with Django application, read through the
-[Django Tutorial](https://docs.djangoproject.com/en/1.6/intro/tutorial01/).
+[Django Tutorial](https://docs.djangoproject.com/en/1.8/intro/tutorial01/).
 
 For the detailed information about all aspect of using Django see the
-[Django Documentation](https://docs.djangoproject.com/en/1.6/).
+[Django Documentation](https://docs.djangoproject.com/en/1.8/).
 
-If You have changed some model and You want to create migrations, see the
-[South Tutorial](http://south.readthedocs.org/en/latest/tutorial/part1.html).

rel-eng/releasers.conf.template

@@ -1,13 +1,13 @@
 [copr]
 releaser = tito.release.CoprReleaser
-project_name = mstuchli/SoftwareCollections
+project_name = jdornak/SoftwareCollections
 upload_command = chmod 0644 %(srpm)s; rsync -p %(srpm)s fedorapeople.org:public_html/
 remote_location = http://<USERNAME>.fedorapeople.org/
 
 [copr-test]
 releaser = tito.release.CoprReleaser
 builder.test = 1
-project_name = mstuchli/SoftwareCollections
+project_name = jdornak/SoftwareCollections
 upload_command = chmod 0644 %(srpm)s; rsync -p %(srpm)s fedorapeople.org:public_html/
 remote_location = http://<USERNAME>.fedorapeople.org/
 

softwarecollections.spec

@@ -36,7 +36,6 @@ Requires:          python3-django-fas
 Requires:          python3-django-markdown2
 Requires:          python3-django-sekizai
 Requires:          python3-django-simple-captcha
-Requires:          python3-django-south
 Requires:          python3-django-tagging
 Requires:          python3-flock
 Requires:          python3-memcached
@@ -148,14 +147,8 @@ if [ ! -e               %{_sysconfdir}/pki/tls/certs/softwarecollections.org.CA.
 fi
 
 service httpd condrestart
-if [ -e %{scls_statedir}/data/db.sqlite3 ]; then
-    # update database
-    softwarecollections syncdb --migrate --noinput || :
-else
-    # install database
-    softwarecollections syncdb --all --noinput || :
-    softwarecollections migrate --fake         || :
-fi
+
+softwarecollections syncdb migrate          || :
 softwarecollections collectstatic --noinput || :
 softwarecollections makeerrorpages          || :
 

softwarecollections/auth/__init__.py

@@ -0,0 +1,3 @@
+
+default_app_config = 'softwarecollections.auth.apps.SoftwarecollectionsAuthConfig'
+

softwarecollections/auth/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+class SoftwarecollectionsAuthConfig(AppConfig):
+    name    = 'softwarecollections.auth'
+    label   = 'softwarecollections.auth'
+

softwarecollections/auth/models.py

@@ -4,11 +4,13 @@
 """
 Django settings for softwarecollections project.
 
+Generated by 'django-admin startproject' using Django 1.8.2.
+
 For more information on this file, see
-https://docs.djangoproject.com/en/1.6/topics/settings/
+https://docs.djangoproject.com/en/1.8/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.6/ref/settings/
+https://docs.djangoproject.com/en/1.8/ref/settings/
 """
 
 # import ugettext_lazy to avoid circular module import
@@ -20,7 +22,7 @@
 
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = 'm0zn_p7x*o(xvk^9p8_$6n7o)dn$bh-*_*xu*b!mg9$ihh0xu+'
@@ -32,9 +34,9 @@
 ALLOWED_HOSTS = []
 
 # Emails
-# https://docs.djangoproject.com/en/1.6/ref/settings/#std:setting-ADMINS
-# https://docs.djangoproject.com/en/1.6/ref/settings/#std:setting-MANAGERS
-# https://docs.djangoproject.com/en/1.6/ref/settings/#std:setting-SERVER_EMAIL
+# https://docs.djangoproject.com/en/1.8/ref/settings/#std:setting-ADMINS
+# https://docs.djangoproject.com/en/1.8/ref/settings/#std:setting-MANAGERS
+# https://docs.djangoproject.com/en/1.8/ref/settings/#std:setting-SERVER_EMAIL
 ADMINS = ()
 MANAGERS = ADMINS
 SERVER_EMAIL = 'SoftwareCollections @ {} <admin@softwarecollections.org>'.format(os.uname()[1])
@@ -45,7 +47,7 @@
 COPR_COPRS_URL = COPR_URL + '/coprs'
 
 # Database
-# https://docs.djangoproject.com/en/1.6/ref/settings/#databases
+# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
 
 DATABASES = {
     'default': {
@@ -55,7 +57,7 @@
 }
 
 # Internationalization
-# https://docs.djangoproject.com/en/1.6/topics/i18n/
+# https://docs.djangoproject.com/en/1.8/topics/i18n/
 
 LANGUAGE_CODE = 'en'
 

softwarecollections/localsettings-development.py

@@ -4,11 +4,13 @@
 """
 Django settings for softwarecollections project.
 
+Generated by 'django-admin startproject' using Django 1.8.2.
+
 For more information on this file, see
-https://docs.djangoproject.com/en/1.6/topics/settings/
+https://docs.djangoproject.com/en/1.8/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.6/ref/settings/
+https://docs.djangoproject.com/en/1.8/ref/settings/
 """
 
 # import ugettext_lazy to avoid circular module import
@@ -29,9 +31,9 @@
 ALLOWED_HOSTS = ['www.softwarecollections.org']
 
 # Emails
-# https://docs.djangoproject.com/en/1.6/ref/settings/#std:setting-ADMINS
-# https://docs.djangoproject.com/en/1.6/ref/settings/#std:setting-MANAGERS
-# https://docs.djangoproject.com/en/1.6/ref/settings/#std:setting-SERVER_EMAIL
+# https://docs.djangoproject.com/en/1.8/ref/settings/#std:setting-ADMINS
+# https://docs.djangoproject.com/en/1.8/ref/settings/#std:setting-MANAGERS
+# https://docs.djangoproject.com/en/1.8/ref/settings/#std:setting-SERVER_EMAIL
 ADMINS = (
     ('Jakub Dorňák',   'jdornak@redhat.com'),
     ('Miroslav Suchý', 'msuchy@redhat.com'),
@@ -46,7 +48,7 @@
 COPR_COPRS_URL = COPR_URL + '/coprs'
 
 # Database
-# https://docs.djangoproject.com/en/1.6/ref/settings/#databases
+# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
 
 DATABASES = {
     'default': {
@@ -56,7 +58,7 @@
 }
 
 # Internationalization
-# https://docs.djangoproject.com/en/1.6/topics/i18n/
+# https://docs.djangoproject.com/en/1.8/topics/i18n/
 
 LANGUAGE_CODE = 'en'