Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Add support for Python 3.5 and 3.6. #5

Closed
wants to merge 3 commits into from
Closed

[WIP] Add support for Python 3.5 and 3.6. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54f3ca7
Add support for Python 3.5 and 3.6.
Mar 21, 2018
39654e4
fix relative import for py3
pbauer Mar 21, 2018
b9aacc1
fix dependency (fix https://github.com/zopefoundation/Products.CMFUid…
pbauer Apr 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ language: python
sudo: false
python:
- 2.7
- 3.5
- 3.6
install:
- pip install coveralls coverage
- pip install -U setuptools==33.1.1
Expand Down
3 changes: 1 addition & 2 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ Products.CMFUid Changelog

- Require `Zope >= 4`.

- Prepare for Python 2 / 3 compatibility.
[pbauer]
- Add support for Python 3.5 and 3.6.

- Adapt tests to the new indexing operations queueing.
Part of PLIP 1343: https://github.com/plone/Products.CMFPlone/issues/1343
Expand Down
6 changes: 3 additions & 3 deletions Products/CMFUid/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ def initialize(context):

from Products.CMFCore import utils

import UniqueIdAnnotationTool
import UniqueIdGeneratorTool
import UniqueIdHandlerTool
from . import UniqueIdAnnotationTool
from . import UniqueIdGeneratorTool
from . import UniqueIdHandlerTool

tools = (
UniqueIdAnnotationTool.UniqueIdAnnotationTool,
Expand Down
8 changes: 6 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ def _read(name):
"Framework :: Zope :: 4",
"Intended Audience :: Developers",
"License :: OSI Approved :: Zope Public License",
"Programming Language :: Python",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Topic :: Software Development",
"Topic :: Software Development :: Libraries :: Application Frameworks",
],
Expand All @@ -44,7 +48,7 @@ def _read(name):
'eggtestinfo',
],
install_requires=[
'Products.CMFCore >= 2.4.0b3',
'Products.CMFCore >= 2.4.0dev',
'Zope',
'setuptools',
],
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[tox]
envlist =
py27,
py35,
py36,
coverage-report,

[testenv]
Expand All @@ -10,7 +12,8 @@ commands =
{envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir}
coverage run {envbindir}/test --all {posargs:-vc}
deps =
zc.buildout
setuptools >= 39
zc.buildout >= 2.11
coverage
setenv =
COVERAGE_FILE=.coverage.{envname}
Expand Down