Browse files

exclude AT from default dependencies to not install ATContentTypes on…

… Plone 5, tune travis and buildout.
  • Loading branch information...
1 parent e6045db commit 7647ed5dc25c7b4c53e32620964af2279ca4b8c5 @saily saily committed Jun 12, 2014
Showing with 101 additions and 89 deletions.
  1. +8 −0 .travis.yml
  2. +16 −27 buildout.cfg
  3. +44 −51 setup.py
  4. +11 −4 test-4.2.cfg
  5. +11 −1 test-4.3.cfg
  6. +0 −3 test-5.0.cfg
  7. +11 −3 travis.cfg
View
8 .travis.yml
@@ -3,6 +3,11 @@ python: 2.7
env:
- PLONE_VERSION=4.2
- PLONE_VERSION=4.3
+ - PLONE_VERSION=5.0
+matrix:
+ allow_failures:
+ - env: PLONE_VERSION=4.2
+ - env: PLONE_VERSION=5.0
before_install:
- sudo apt-get install -y libjpeg-dev libgif-dev libpng-dev libz-dev
- mkdir -p buildout-cache/downloads
@@ -22,4 +27,7 @@ after_success:
- pip install -q coveralls
- coveralls
after_failure:
+ - bin/csslint --version
+ - bin/jshint --version
+ - bin/jscs --version
- firefox -v
View
43 buildout.cfg
@@ -2,24 +2,12 @@
extends = test-4.3.cfg
parts +=
packages
- i18ndude
rebuild_pot
- zptlint
+ node
+ extras
code-analysis
createcoverage
-eggs +=
- plone.app.dexterity [grok]
- plone.app.contenttypes
- plone.reload
-
-test-eggs +=
- Products.ATContentTypes [test]
- plone.app.contenttypes [test]
- plone.app.dexterity [test]
- decorator
- selenium
-
versions = versions
@@ -28,14 +16,11 @@ recipe = collective.recipe.omelette
eggs = ${instance:eggs} ${buildout:test-eggs}
-[i18ndude]
+[extras]
recipe = zc.recipe.egg
-eggs = i18ndude
-
-
-[zptlint]
-recipe = zc.recipe.egg
-eggs = zptlint
+eggs =
+ i18ndude
+ zptlint
[rebuild_pot]
@@ -73,21 +58,26 @@ directory = ${buildout:directory}/src/plone/app/imagecropping
pre-commit-hook = True
clean-lines = True
csslint = True
+csslint-bin = ${buildout:bin-directory}/csslint
debug-statements = True
deprecated-aliases = True
flake8-max-complexity = 12
imports = True
-jshint = True
-jshint-exclude =
+jscs = True
+jscs-bin = ${buildout:bin-directory}/jscs
+jscs-exclude =
src/plone/app/imagecropping/browser/static/jquery.Jcrop.min.js
+jshint = True
+jshint-bin = ${buildout:bin-directory}/jshint
+jshint-exclude = ${code-analysis:jscs-exclude}
pep3101 = True
prefer-single-quotes = True
return-status-codes = False
utf8-header = True
find-untranslated = True
-i18ndude-bin = ${buildout:directory}/bin/i18ndude
+i18ndude-bin = ${buildout:bin-directory}/i18ndude
zptlint = True
-zptlint-bin = ${buildout:directory}/bin/zptlint
+zptlint-bin = ${buildout:bin-directory}/zptlint
[createcoverage]
@@ -96,6 +86,5 @@ eggs = createcoverage
[versions]
-Pillow = 2.3.0
+Pillow = 2.4.0
selenium = 2.40.0
-plone.app.contenttypes = 1.0
View
95 setup.py
@@ -1,27 +1,17 @@
from setuptools import setup, find_packages
-import os
-import pkg_resources
-from distutils.version import LooseVersion
version = '1.0.dev0'
-long_description = (
- open('README.rst').read()
- + '\n' +
- 'Contributors\n'
- '============\n'
- + '\n' +
- open('CONTRIBUTORS.txt').read()
- + '\n' +
- open('CHANGES.txt').read()
- + '\n')
-
-setup(name='plone.app.imagecropping',
- version=version,
- description=\
- "allows images to be manually cropped using JCrop JS library",
- long_description=long_description,
- classifiers=[
+setup(
+ name='plone.app.imagecropping',
+ version=version,
+ description="allows images to be manually cropped using JCrop JS library",
+ long_description='\n\n'.join([
+ open('README.rst').read(),
+ open('CONTRIBUTORS.txt').read(),
+ open('CHANGES.txt').read(),
+ ]),
+ classifiers=[
"Development Status :: 5 - Production/Stable",
"Environment :: Web Environment",
"Framework :: Plone",
@@ -34,34 +24,37 @@
"Programming Language :: Python",
"Programming Language :: Python :: 2.7",
"Topic :: Software Development :: Libraries :: Python Modules",
- ],
- keywords='plone image crop',
- author='',
- author_email='',
- url='https://github.com/collective/plone.app.imagecropping',
- license='GPLv2',
- packages=find_packages('src'),
- package_dir={'': 'src'},
- namespace_packages=['plone', 'plone.app'],
- include_package_data=True,
- zip_safe=False,
- install_requires=[
- 'setuptools',
- 'Pillow',
- 'plone.app.imaging',
- 'Products.ATContentTypes',
- 'Products.CMFPlone>=4.1'
- ],
- extras_require={
- 'test': [
- 'plone.app.testing[robot]>=4.2.2',
- 'plone.app.dexterity',
- 'plone.namedfile>=2.0.1',
- ],
- },
- entry_points="""
- # -*- Entry points: -*-
- [z3c.autoinclude.plugin]
- target = plone
- """,
- )
+ ],
+ keywords='plone image crop',
+ author='',
+ author_email='',
+ url='https://github.com/collective/plone.app.imagecropping',
+ license='GPLv2',
+ packages=find_packages('src'),
+ package_dir={'': 'src'},
+ namespace_packages=['plone', 'plone.app'],
+ include_package_data=True,
+ zip_safe=False,
+ install_requires=[
+ 'setuptools',
+ 'Pillow',
+ 'plone.app.imaging',
+ 'Products.CMFPlone>=4.2'
+ ],
+ extras_require={
+ 'test': [
+ 'plone.app.testing[robot]>=4.2.2',
+ 'plone.app.robotframework',
+ 'plone.app.contenttypes',
+ 'plone.namedfile>=2.0.1',
+ ],
+ 'archetypes': [
+ 'Products.ATContentTypes',
+ ],
+ },
+ entry_points="""
+ # -*- Entry points: -*-
+ [z3c.autoinclude.plugin]
+ target = plone
+ """,
+)
View
15 test-4.2.cfg
@@ -1,9 +1,16 @@
[buildout]
extends = https://raw.github.com/collective/buildout.plonetest/master/test-4.2.x.cfg
package-name = plone.app.imagecropping
-package-extras = [test]
+package-extras = [archetypes, test]
-[versions]
-selenium = 2.40.0
-plone.namedfile = 2.0.1
+[versions]
+plone.app.contenttypes = 1.0
+plone.app.dexterity = 2.0.11
+plone.app.event = 1.1b1
+plone.app.portlets = 2.5.1
+plone.app.z3cform = 0.7.2
+plone.dexterity = 2.2.1
+plone.namedfile = 2.0.5
+plone.schemaeditor = 1.3.5
+z3c.form = 3.2.1
View
12 test-4.3.cfg
@@ -3,5 +3,15 @@ extends = https://raw.github.com/collective/buildout.plonetest/master/test-4.3.x
package-name = plone.app.imagecropping
package-extras = [test]
+
[versions]
-selenium = 2.40.0
+plone.app.contenttypes = 1.1b1
+plone.app.dexterity = 2.1.1
+plone.app.event = 1.1.1
+plone.app.portlets = 2.5.1
+plone.app.vocabularies = 2.1.15
+plone.app.z3cform = 0.7.6
+plone.dexterity = 2.2.3
+plone.namedfile = 2.0.5
+plone.schemaeditor = 1.3.7
+z3c.form = 3.2.1
View
3 test-5.0.cfg
@@ -2,6 +2,3 @@
extends = https://raw.github.com/collective/buildout.plonetest/master/test-5.0.x.cfg
package-name = plone.app.imagecropping
package-extras = [test]
-
-[versions]
-selenium = 2.40.0
View
14 travis.cfg
@@ -1,4 +1,12 @@
[buildout]
-extends = buildout.cfg
-parts -=
- packages
+extends =
+ https://raw.githubusercontent.com/collective/buildout.plonetest/master/buildout-cache.cfg
+ buildout.cfg
+parts =
+ download
+ install
+ extras
+ node
+ code-analysis
+ createcoverage
+ test

0 comments on commit 7647ed5

Please sign in to comment.