Merge 76d01da into bb25ef4

plone · Jul 4, 2018 · 3ca1698 · 3ca1698
2 parents bb25ef4 + 76d01da
commit 3ca1698
Show file tree

Hide file tree

Showing 32 changed files with 728 additions and 354 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,36 @@
+# EditorConfig Configuration file, for more details see:
+# http://EditorConfig.org
+# EditorConfig is a convention description, that could be interpreted
+# by multiple editors to enforce common coding conventions for specific
+# file types
+
+# top-most EditorConfig file:
+# Will ignore other EditorConfig files in Home directory or upper tree level.
+root = true
+
+
+[*]  # For All Files
+# Unix-style newlines with a newline ending every file
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+# Set default charset
+charset = utf-8
+# Indent style default
+indent_style = space
+# Max Line Length - a hard line wrap, should be disabled
+max_line_length = off
+
+[*.{py,cfg,ini}]
+# 4 space indentation
+indent_size = 4
+
+[*.{yml}]
+# 2 space indentation
+indent_size = 2
+
+[{Makefile,.gitmodules}]
+# Tab indentation (no size specified, but view as 4 spaces)
+indent_style = tab
+indent_size = unset
+tab_width = unset
diff --git a/.gitignore b/.gitignore
@@ -8,18 +8,21 @@
 /build
 /dist
 /local.cfg
-/*.egg-info
+*.egg-info
 /.installed.cfg
-*.pyc
+*.py[cod]
 /.Python
+/pip-selfcheck.json
 /include
 /lib
-/src
 /.project
 /.pydevproject
 /.mr.developer.cfg
-/src/plone*
-/src/collective*
+/src-mrd/
+/.tox/
+/_build/
+coverage.xml
+.coverage*
 *.mo
 docs/Makefile
 docs/make.bat

diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,35 @@
+language: python
+sudo: false
+
+matrix:
+    include:
+        - python: "2.7"
+          env: TOXENV=lint-py27
+        - python: "3.6"
+          env: TOXENV=lint-py36
+        - python: "2.7"
+          env: TOXENV=py27
+        - python: "3.5"
+          env: TOXENV=py35
+        - python: "3.6"
+          env: TOXENV=py36
+        - python: "3.7-dev"
+          env: TOXENV=py37
+    allow_failures:
+        - python: "3.7-dev"
+          env: TOXENV=py37
+
+install:
+    - travis_retry pip install -U tox coveralls coverage
+
+script:
+    - tox
+
+after_success:
+    - coverage combine
+    - coveralls
+
+notifications:
+    email: false
+cache:
+    pip: true
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -6,7 +6,7 @@ Changelog
 
 Breaking changes:
 
-- *add item here*
+- Require `plone.testing >= 7.0`.
 
 New features:
 
@@ -16,9 +16,12 @@ New features:
 - Load negotiator from plone.i18n (PTS removed).
   [jensens, ksuess]
 
+- Add support for Python 3.5 and 3.6.
+  [loechel, ale-rt, icemac]
+
 Bug fixes:
 
-- *add item here*
+- *none yet*
 
 
 5.0.8 (2017-10-25)

diff --git a/README.rst b/README.rst
@@ -1 +1 @@
-docs/source/README.rst
+docs/README.rst
diff --git a/buildout.cfg b/buildout.cfg
@@ -1,32 +1,39 @@
 [buildout]
 extends = https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-5.x.cfg
-parts = coverage test test-chrome test-ie report report-xml
+          https://raw.githubusercontent.com/plone/buildout.coredev/5.2/versions.cfg
+          https://raw.githubusercontent.com/plone/buildout.coredev/5.2/sources.cfg
+          https://raw.githubusercontent.com/plone/buildout.coredev/5.2/checkouts.cfg
+
+parts =
+    coverage
+    test
+    test-chrome
+    test-ie
+    report
+    report-xml
+
 extensions = mr.developer
+
 sources = sources
-auto-checkout =
-    plone.testing
-    Products.GenericSetup
+versions = versions
+
+auto-checkout = *
+
+sources-dir = src-mrd
 
-[remotes]
-plone = git://github.com/plone
-plone_push = git@github.com:plone
-zope = svn://svn.zope.org/repos/main/
+develop = .
 
 [versions]
 plone.app.testing =
-Products.GenericSetup =
 
 [sources]
-plone.testing         = git ${remotes:plone}/plone.testing.git pushurl=${remotes:plone_push}/plone.testing.git branch=master
-Products.GenericSetup = svn ${remotes:zope}/Products.GenericSetup/trunk
+plone.testing                 = git ${remotes:plone}/plone.testing.git pushurl=${remotes:plone_push}/plone.testing.git branch=py3_disallow_commits
 
 [test]
-recipe = collective.xmltestreport
+recipe = zc.recipe.testrunner
 eggs =
-    Pillow
-    plone.testing [test]
-    plone.app.testing [test]
-defaults = ['--auto-color', '--auto-progress']
+    plone.app.testing[test]
+defaults = ['--auto-color']
 selenium-driver =
 environment = testenv
 

diff --git a/docs/source/README.rst → docs/README.rst b/docs/source/README.rst → docs/README.rst
diff --git a/docs/source/conf.py → docs/conf.py b/docs/source/conf.py → docs/conf.py
@@ -41,7 +41,7 @@
 
 # General information about the project.
 project = u'plone.app.testing'
-copyright = u'2015, Plone Foundation'
+copyright = u'2018, Plone Foundation'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/docs/source/index.rst → docs/index.rst b/docs/source/index.rst → docs/index.rst
diff --git a/docs/source/isolation.rst → docs/isolation.rst b/docs/source/isolation.rst → docs/isolation.rst
diff --git a/docs/source/views.rst → docs/views.rst b/docs/source/views.rst → docs/views.rst
diff --git a/docs/source/zope-testbrowser.rst → docs/zope-testbrowser.rst b/docs/source/zope-testbrowser.rst → docs/zope-testbrowser.rst
diff --git a/setup.cfg b/setup.cfg
@@ -1,11 +1,60 @@
+[build_sphinx]
+source-dir = docs/source
+build-dir  = _build/docs
+all_files  = 1
+
+[upload_sphinx]
+upload-dir = _build/docs/html
+
 [check-manifest]
 ignore =
-    *.cfg
     bootstrap.py
+    buildout.cfg
+    tox.ini
+
+[coverage:run]
+branch = True
+
+source =
+    src
+
+omit =
+
+[coverage:report]
+precision = 2
+
+[coverage:html]
+directory = _build/reports/coverage
+
+
+[isort]
+# for details see
+# http://docs.plone.org/develop/styleguide/python.html#grouping-and-sorting
+force_alphabetical_sort = True
+force_single_line = True
+lines_after_imports = 2
+line_length = 200
+not_skip = __init__.py
+
+[flake8]
+exclude =
+    bootstrap.py,
+
+include =
+    src
+
+ignore =
+    N801,
+    N802,
+    N803,
+    N805,
+    N806,
+    N812,
+    T000,
+    T003,
 
 [zest.releaser]
 create-wheel = yes
 
-# When Python 2-3 compatible:
-# [bdist_wheel]
-# universal = 1
+[bdist_wheel]
+universal = 1
diff --git a/setup.py b/setup.py
@@ -1,61 +1,78 @@
-from setuptools import setup, find_packages
+# -*- coding: utf-8 -*-
+from setuptools import find_packages
+from setuptools import setup
+
 import os
 
+
 version = '6.0.0.dev0'
 
-tests_require = ['Products.CMFCore',
-                 'Products.CMFPlone',
-                 'Products.PluggableAuthService',
-                 'Products.ATContentTypes',  # XXX unspecified dependency of plone.app.upgrade XXX
-                 'Products.CMFPlacefulWorkflow',
-                 'selenium',
-                 'transaction',
-                 'zope.interface',
-                 'zope.publisher',
-                 'zope.testrunner',
-                 ]
+tests_require = [
+    'plone.testing[test]',
+    'Products.CMFCore',
+    'Products.CMFPlacefulWorkflow',
+    'Products.CMFPlone',
+    'Products.PluggableAuthService',
+    'selenium',
+    'transaction',
+    'zope.interface',
+    'zope.publisher',
+    'zope.testing',
+    'zope.testrunner',
+    # XXX unspecified dependency of plone.app.upgrade XXX
+    # 'Products.ATContentTypes',
+]
+
+robot_require = [
+    'robotsuite>=1.4.0',
+    'robotframework-selenium2library',
+    'decorator',
+    'selenium',
+]
 
-robot_require = ['robotsuite>=1.4.0',
-                 'robotframework-selenium2library',
-                 'decorator',
-                 'selenium']
 
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
+
 long_description = \
-    read('docs', 'source','README.rst') + \
+    read('docs', 'README.rst') + \
     '\n\n' +\
     read('CHANGES.rst')
 
+
 setup(
     name='plone.app.testing',
     version=version,
-    description="Testing tools for Plone-the-application, based on plone.testing.",
+    description="Testing tools for Plone-the-application, based on plone.testing.",  # NOQA: E501
     long_description=long_description,
     classifiers=[
         "Environment :: Web Environment",
         "Framework :: Plone",
-        "Framework :: Plone :: 5.0",
-        "Framework :: Plone :: 5.1",
-        "Framework :: Zope2",
+        "Framework :: Plone :: 5.2",
+        "Framework :: Zope :: 4",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        # "Programming Language :: Python :: 3.7",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
     ],
     keywords='plone tests',
     author='Plone Foundation',
     author_email='plone-developers@lists.sourceforge.net',
-    url='https://pypi.python.org/pypi/plone.app.testing',
+    url='https://github.com/plone/plone.app.testing',
     license='GPL version 2',
-    packages=find_packages(exclude=['ez_setup']),
+    packages=find_packages('src'),
+    package_dir={'': 'src'},
     namespace_packages=['plone', 'plone.app'],
     include_package_data=True,
     zip_safe=False,
     install_requires=[
         'setuptools',
+        'six',
         'zope.configuration',
         'zope.component',
         'zope.dottedname',
@@ -67,7 +84,7 @@ def read(*rnames):
         # 'AccessControl', # Zope 2.13+
         'Products.CMFPlone',
         'Products.GenericSetup',
-        'Zope2',
+        'Zope',
     ],
     tests_require=tests_require,
     extras_require={

diff --git a/plone/__init__.py → src/plone/__init__.py b/plone/__init__.py → src/plone/__init__.py
diff --git a/plone/app/__init__.py → src/plone/app/__init__.py b/plone/app/__init__.py → src/plone/app/__init__.py
diff --git a/plone/app/testing/__init__.py → src/plone/app/testing/__init__.py b/plone/app/testing/__init__.py → src/plone/app/testing/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# flake8: noqa
+# flake8: NOQA: F401
 from plone.app.testing.cleanup import cleanUpMultiPlugins
 from plone.app.testing.helpers import applyProfile
 from plone.app.testing.helpers import login