Merge pull request #40 from collective/thet-setup-cleanup

setup cleanup

.gitignore

@@ -20,6 +20,7 @@ eggs
 htmlcov/
 include/
 lib/
+lib64
 local/
 output.xml
 parts/

.travis.yml

@@ -1,16 +1,10 @@
 language: python
+python: 2.7
 sudo: false
 cache:
   pip: true
   directories:
     - $HOME/buildout-cache
-python:
-  - 2.7
-env:
-  - PLONE_VERSION=4.1.x
-  - PLONE_VERSION=4.2.x
-  - PLONE_VERSION=4.3.x
-  - PLONE_VERSION=5.0.x
 before_install:
   - mkdir -p $HOME/buildout-cache/{eggs,downloads}
   - mkdir $HOME/.buildout
@@ -19,11 +13,15 @@ before_install:
   - echo "eggs-directory = $HOME/buildout-cache/eggs" >> $HOME/.buildout/default.cfg
   - virtualenv .
   - bin/pip install --upgrade pip setuptools zc.buildout coveralls
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+env:
+  - PLONE_VERSION=4.3.x
+  - PLONE_VERSION=5.0.x
 install:
   - sed -ie "s#plone-4.3.x.cfg#plone-$PLONE_VERSION.cfg#" travis.cfg
   - bin/buildout -N -t 3 -c travis.cfg
+before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
 script:
   - bin/code-analysis
   - bin/test --all

docs/HISTORY.rst → CHANGES.rst

@@ -4,6 +4,9 @@ Changelog
 2.1 - (unreleased)
 ------------------
 
+- Setup related cleanups.
+  [thet]
+
 - fix ``IImagingSchema`` traverser for Plone 4, disable in Plone 5
   [jensens]
 

base.cfg

@@ -6,10 +6,7 @@ parts =
     coverage
     test-coverage
     robot
-    resourcehelper
     releaser
-    omelette
-    sphinxbuilder
 
 develop = .
 
@@ -40,7 +37,6 @@ recipe = zc.recipe.testrunner
 eggs =
     collective.lineage[test]
     ipdb
-
 defaults = ['-s', 'collective.lineage', '--auto-color', '--auto-progress']
 
 
@@ -53,7 +49,7 @@ eggs = coverage
 recipe = collective.recipe.template
 input = inline:
     #!/bin/bash
-    ${buildout:directory}/bin/coverage run --source=${buildout:directory}/src/pas/plugins/authomatic bin/test
+    ${buildout:directory}/bin/coverage run --source=${buildout:directory}/src/collective/lineage bin/test
     ${buildout:directory}/bin/coverage html
     ${buildout:directory}/bin/coverage report -m --fail-under=85
     # Fail (exit status 1) if coverage returns exit status 2 (this happens
@@ -69,27 +65,16 @@ eggs =
     plone.app.robotframework[debug,ride,reload]
 
 
-[resourcehelper]
-recipe = zc.recipe.egg:scripts
-eggs =
-    ${instance:eggs}
-    Products.CMFPlone
-scripts =
-    plone-generate-gruntfile
-    plone-compile-resources
-
-
 [releaser]
-recipe = zc.recipe.egg:scripts
+recipe = zc.recipe.egg
 eggs =
-    zest.releaser[recommended]
-    twine
-
-
-[omelette]
-recipe = collective.recipe.omelette
-eggs = ${test:eggs}
+    zest.releaser
+    readme
 
 
-[sphinxbuilder]
-recipe = collective.recipe.sphinxbuilder
+[versions]
+setuptools =
+zc.buildout =
+zc.recipe.egg = 2.0.1
+flake8 = 2.3.0
+coverage = >=3.7

bootstrap-4.3.x.sh

@@ -2,7 +2,6 @@
 
 # see https://community.plone.org/t/not-using-bootstrap-py-as-default/620
 rm -r ./lib ./include ./local ./bin
-ln -fs plone-4.3.x.cfg buildout.cfg
 virtualenv --clear .
 ./bin/pip install --upgrade pip setuptools zc.buildout
-./bin/buildout 
+./bin/buildout -c plone-4.3.x.cfg

bootstrap-5.0.x.sh

@@ -1,8 +1,7 @@
 #!/bin/sh
 
 # see https://community.plone.org/t/not-using-bootstrap-py-as-default/620
-ln -fs plone-5.0.x.cfg buildout.cfg
 rm -r ./lib ./include ./local ./bin
 virtualenv --clear .
 ./bin/pip install --upgrade pip setuptools zc.buildout
-./bin/buildout
+./bin/buildout -c plone-5.0.x.cfg

plone-4.3.x.cfg

@@ -1,5 +1,4 @@
 [buildout]
 extends =
+    http://dist.plone.org/release/4.3-latest/versions.cfg
     base.cfg
-    http://dist.plone.org/release/4.3.7/versions.cfg
-    versions.cfg

plone-5.0.x.cfg

@@ -1,8 +1,4 @@
 [buildout]
 extends =
+    http://dist.plone.org/release/5.0-latest/versions.cfg
     base.cfg
-    http://dist.plone.org/release/5.0/versions.cfg
-    versions.cfg
-
-parts +=
-    resourcehelper

setup.py

@@ -1,36 +1,32 @@
-import os
-from setuptools import setup, find_packages
-
-version = '2.1.dev0'
+# -*- coding: utf-8 -*-
+from setuptools import find_packages
+from setuptools import setup
 
 
-def read(*rnames):
-    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-
-# line breaks are needed after each block so that reST doesn't get mad
+version = '2.1.dev0'
+short_description = u"The microsite creation product for Plone"
+long_description = u'\n\n'.join([
+    open('README.rst').read(),
+    open('CHANGES.rst').read()
+])
 
-long_description = '\n\n'.join((read('README.rst'),
-                                read('docs', 'INSTALL.rst'),
-                                read('docs', 'HISTORY.rst')))
 
 setup(
     name='collective.lineage',
     version=version,
-    description="The microsite creation product for Plone",
+    description=short_description,
     long_description=long_description,
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
         "Framework :: Plone",
-        "Framework :: Plone :: 4.0",
-        "Framework :: Plone :: 4.1",
-        "Framework :: Plone :: 4.2",
+        "Framework :: Plone :: 4.3",
+        "Framework :: Plone :: 5.0",
         "Intended Audience :: End Users/Desktop",
         "Intended Audience :: System Administrators",
         "License :: OSI Approved :: GNU General Public License (GPL)",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
@@ -47,11 +43,9 @@ def read(*rnames):
     install_requires=[
         'setuptools',
         'Plone',
-        'plone.app.imaging',
     ],
     extras_require={
         'test': [
-            'interlude',
             'plone.app.testing',
         ],
     },

src/collective/__init__.py

@@ -1,6 +1,2 @@
-# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-    from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)
+# -*- coding: utf-8 -*-
+__import__('pkg_resources').declare_namespace(__name__)

src/collective/lineage/__init__.py

@@ -1,7 +1,3 @@
 # -*- coding: utf-8 -*-
 import zope.i18nmessageid
 MessageFactory = zope.i18nmessageid.MessageFactory("collective.lineage")
-
-
-def initialize(context):
-    """Initializer called when used as a Zope 2 product."""

src/collective/lineage/configure.zcml

@@ -1,12 +1,11 @@
 <configure
+    xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
     xmlns:zcml="http://namespaces.zope.org/zcml"
-    xmlns="http://namespaces.zope.org/zope"
     xmlns:i18n="http://namespaces.zope.org/i18n"
     i18n_domain="collective.lineage">
 
-  <includePlugins package="." />
   <i18n:registerTranslations directory="locales" />
 
   <include package="Products.CMFCore" file="permissions.zcml"

src/collective/lineage/profiles/default/browserlayer.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <layers>
   <layer name="collective.lineage" interface="collective.lineage.interfaces.ILineageBrowserLayer" />
 </layers>

src/collective/lineage/profiles/default/metadata.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <metadata>
   <version>220</version>
 </metadata>

src/collective/lineage/profiles/uninstall/browserlayer.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <layers>
   <layer remove="true" name="collective.lineage" interface="collective.lineage.interfaces.ILineageBrowserLayer"/>
 </layers>