Merge 1f1f58a into d9995f9

CHANGES.rst

@@ -5,7 +5,12 @@ Changelog for nensskel
 1.37 (unreleased)
 -----------------
 
-- Nothing changed yet.
+- Removed lizard-ui/lizard-map and so.
+
+- Removed sitesetup/fabfile.
+
+- South is also removed, so you need to use django 1.8+ for the
+  migrations. Note that this version isn't included in the KGS yet.
 
 
 1.36.1 (2015-09-19)

nensskel/templates/djangoapp/+package+/testsettings.py_tmpl

@@ -84,8 +84,6 @@ SITE_ID = 1
 SECRET_KEY = 'This is not secret but that is ok.'
 INSTALLED_APPS = [
     '${package}',
-    'lizard_ui',
-    'south',
     'django_nose',
     'lizard_security',
     'django_extensions',

nensskel/templates/djangoapp/setup.py_tmpl

@@ -1,18 +1,17 @@
+import monkeypatch_setuptools
 from setuptools import setup
 
 version = '0.1dev'
 
 long_description = '\n\n'.join([
     open('README.rst').read(),
-    open('CREDITS.rst').read(),
     open('CHANGES.rst').read(),
     ])
 
 install_requires = [
     'Django',
     'django-extensions',
     'django-nose',
-    'lizard-ui >= 4.0b5',
     ],
 
 tests_require = [

nensskel/templates/library/README.rst_tmpl

@@ -20,9 +20,6 @@ nensskel.
 - Fill in your username and email address in the ``setup.py``, see the
   ``TODO`` fields. If you use it, also check the ``bower.json``.
 
-- Also add your name to ``CREDITS.rst``. It is open source software, so you
-  should claim credit!
-
 - Check https://github.com/nens/$project/settings/collaboration if the team
   "Nelen & Schuurmans" has access.
 

nensskel/templates/library/doc/source/project.rst

@@ -7,8 +7,6 @@ Project documentation
 
 .. include:: ../../CHANGES.rst
 
-.. include:: ../../CREDITS.rst
-
 .. raw:: latex
 
    \setcounter{secnumdepth}{2}

nensskel/templates/library/monkeypatch_setuptools.py

@@ -0,0 +1,18 @@
+# Hopefully temporary fix for
+# https://bitbucket.org/pypa/setuptools/issues/450/egg_info-command-is-very-slow-if-there-are
+import os
+
+
+TO_OMIT = ['var', '.git', 'parts', 'bower_components', 'node_modules', 'eggs',
+           'bin', 'develop-eggs']
+
+orig_os_walk = os.walk
+
+def patched_os_walk(path, *args, **kwargs):
+    for (dirpath, dirnames, filenames) in orig_os_walk(path, *args, **kwargs):
+        if '.git' in dirnames:
+            print("MONKEY PATCH: omitting a few directories like var/...")
+            dirnames[:] = list(set(dirnames) - set(TO_OMIT))
+        yield (dirpath, dirnames, filenames)
+
+os.walk = patched_os_walk

nensskel/templates/library/setup.cfg_tmpl

@@ -1,7 +1,5 @@
 [nosetests]
 with-xunit=1
-with-doctest=1
-doctest-extension=rst
 cover-package = ${package}
 with-coverage = 1
 cover-erase = 1

nensskel/templates/library/setup.py_tmpl

@@ -1,10 +1,10 @@
+import monkeypatch_setuptools
 from setuptools import setup
 
 version = '0.1dev'
 
 long_description = '\n\n'.join([
     open('README.rst').read(),
-    open('CREDITS.rst').read(),
     open('CHANGES.rst').read(),
     ])
 

nensskel/templates/lizardsite/+package+/settings.py_tmpl

@@ -195,15 +195,7 @@ MIDDLEWARE_CLASSES = (
 
 INSTALLED_APPS = (
     '${package}',
-    # lizard_maptree and lizard_wms are included for demo purposes. Almost
-    # every site needs them, but you're free to remove them if unneeded.
-    'lizard_maptree',
-    'lizard_wms',
-    'lizard_map',
-    'lizard_ui',
     'lizard_security',
-    'south',
-    'compressor',
     'raven.contrib.django.raven_compat',
     'django_extensions',
     'django.contrib.admin',

nensskel/templates/lizardsite/README.rst_tmpl

@@ -61,13 +61,6 @@ Set up a database (and yes, set up an admin user when asked)::
     $ bin/django syncdb
     $ bin/django migrate
 
-And import two fixtures. The background_maps sets up a couple of lizard-map
-defaults. Democontent gives you an initial homepage and a link to an example
-WMS layer::
-
-    $ bin/django loaddata background_maps
-    $ bin/django loaddata democontent
-
 Start the server::
 
     $ bin/django runserver

nensskel/templates/lizardsite/development.cfg_tmpl

@@ -118,10 +118,8 @@ eggs =
     \${buildout:eggs}
 # Development tools
     createcoverage
-    fabric
     pep8
     pyflakes
-    sitesetup
     zest.releaser
 
 

nensskel/templates/lizardsite/setup.py_tmpl

@@ -1,10 +1,10 @@
+import monkeypatch_setuptools
 from setuptools import setup
 
 version = '0.1dev'
 
 long_description = '\n\n'.join([
     open('README.rst').read(),
-    open('CREDITS.rst').read(),
     open('CHANGES.rst').read(),
     ])
 
@@ -14,16 +14,9 @@ install_requires = [
     'django-extensions',
     'django-nose',
     'gunicorn',
-    'lizard-map',
-    'lizard-ui',
     'python-memcached',
     'raven',
-    'south',
     'werkzeug',
-    # Maptree and wms are included for demo purposes; almost every site needs
-    # them anyway.
-    'lizard-maptree',
-    'lizard-wms',
     ],
 
 tests_require = [