Skip to content

Commit

Permalink
Clean up Python dependencies
Browse files Browse the repository at this point in the history
- Specify supported Python versions using ``python_requires`` in setup.py
- Added support for Python 3.8 (Travis allows test failures, waiting
  for a fixed Zope release)
  • Loading branch information
dataflake committed Feb 18, 2019
1 parent d08d378 commit c332a04
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ matrix:
include:
- python: "3.7"
dist: xenial
sudo: true
allow_failures:
- python: "3.8-dev"
dist: xenial
install:
- pip install -U coverage coveralls
- pip install zc.buildout
Expand Down
4 changes: 3 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ Changelog
2.0b6 (unreleased)
------------------

- Nothing changed yet.
- Specify supported Python versions using ``python_requires`` in setup.py

- Adding suport for Python 3.8


2.0b5 (2018-12-14)
Expand Down
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def _package_doc(name):
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: Implementation :: CPython",
"Topic :: Software Development",
"Topic :: System :: Archiving :: Packaging",
Expand All @@ -58,6 +59,7 @@ def _package_doc(name):
include_package_data=True,
namespace_packages=['Products'],
zip_safe=False,
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
setup_requires=['eggtestinfo',
],
install_requires=[
Expand All @@ -67,6 +69,7 @@ def _package_doc(name):
'zope.interface >= 3.8',
'five.localsitemanager',
'Products.PythonScripts',
'Products.ZCTextIndex',

This comment has been minimized.

Copy link
@icemac

icemac Feb 20, 2019

Member

@dataflake The code which was previously in Products.ZCTextIndex now lives in Products.ZCatalog. Why is this new dependency needed?

This comment has been minimized.

Copy link
@dataflake

dataflake Feb 20, 2019

Author Member

You're right, I didn't even look closer at that Products.ZCTextIndex package. Fixed in 21863e6.

'Products.ZCatalog',
],
tests_require=[
Expand Down
7 changes: 4 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ envlist =
py35,
py36,
py37,
py38,
flake8,
coverage,
docs,
Expand All @@ -24,7 +25,7 @@ setenv =
COVERAGE_FILE=.coverage.{envname}

[testenv:coverage]
basepython = python2.7
basepython = python3.6
deps = coverage
setenv =
COVERAGE_FILE=.coverage
Expand All @@ -36,7 +37,7 @@ commands =
coverage report

[testenv:flake8]
basepython = python2.7
basepython = python3.6
deps =
flake8
flake8-html
Expand All @@ -49,7 +50,7 @@ commands =

[testenv:docs]
basepython =
python2.7
python3.6
pip_pre = True
commands =
sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
Expand Down

0 comments on commit c332a04

Please sign in to comment.