Skip to content

Commit

Permalink
Merge pull request #143 from zopefoundation/drop-py34
Browse files Browse the repository at this point in the history
Drop support for Python 3.4
  • Loading branch information
mgedmin committed Aug 20, 2019
2 parents 3042b9f + d952fc3 commit d603267
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 18 deletions.
1 change: 0 additions & 1 deletion .manylinux-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ set -e -x
# Compile wheels
for PYBIN in /opt/python/*/bin; do
if [[ "${PYBIN}" == *"cp27"* ]] || \
[[ "${PYBIN}" == *"cp34"* ]] || \
[[ "${PYBIN}" == *"cp35"* ]] || \
[[ "${PYBIN}" == *"cp36"* ]] || \
[[ "${PYBIN}" == *"cp37"* ]]; then
Expand Down
5 changes: 0 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ matrix:
include:
- os: linux
python: 2.7
- os: linux
python: 3.4
- os: linux
python: 3.5
- os: linux
Expand All @@ -24,9 +22,6 @@ matrix:
- os: osx
language: generic
env: TERRYFY_PYTHON='macpython 2.7'
- os: osx
language: generic
env: TERRYFY_PYTHON='macpython 3.4'
- os: osx
language: generic
env: TERRYFY_PYTHON='macpython 3.5'
Expand Down
4 changes: 2 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Changes
=======

4.6.1 (unreleased)
4.7.0 (unreleased)
------------------

- Nothing changed yet.
- Drop support for Python 3.4.


4.6.0 (2018-10-23)
Expand Down
2 changes: 0 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ environment:
matrix:
- python: 27
- python: 27-x64
- python: 34
- python: 34-x64
- python: 35
- python: 35-x64
- python: 36
Expand Down
14 changes: 8 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,11 @@ def _unavailable(self, e):
An optional code optimization (C extension) could not be compiled.
Optimizations for this package will not be available!""")
print()
print("")
print(e)
print('*' * 80)


codeoptimization_c = os.path.join('src', 'zope', 'interface',
'_zope_interface_coptimizations.c')
codeoptimization = Feature(
Expand Down Expand Up @@ -90,14 +91,15 @@ def read(*rnames):
with open(os.path.join(os.path.dirname(__file__), *rnames)) as f:
return f.read()

long_description=(

long_description = (
read('README.rst')
+ '\n' +
read('CHANGES.rst')
)

setup(name='zope.interface',
version='4.6.1.dev0',
version='4.7.0.dev0',
url='https://github.com/zopefoundation/zope.interface',
license='ZPL 2.1',
description='Interfaces for Python',
Expand All @@ -113,7 +115,6 @@ def read(*rnames):
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
Expand All @@ -133,13 +134,14 @@ def read(*rnames):
zip_safe=False,
tests_require=tests_require,
install_requires=['setuptools'],
python_requires=', '.join((
python_requires=', '.join([
'>=2.7',
'!=3.0.*',
'!=3.1.*',
'!=3.2.*',
'!=3.3.*',
)),
'!=3.4.*',
]),
extras_require={
'docs': ['Sphinx', 'repoze.sphinx.autointerface'],
'test': tests_require,
Expand Down
8 changes: 6 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[tox]
envlist =
py27,py27-pure,py34,py34-pure,py35,py36,py37,pypy,pypy3,coverage,docs
py27,py27-pure,py35,py35-pure,py36,py37,pypy,pypy3,coverage,docs
# NB: if you add new environments, please also add them to depends in
# testenv:coverage so that parallel runs (tox -p auto) will work correctly

[testenv]
commands =
Expand All @@ -16,7 +18,7 @@ setenv =
PURE_PYTHON=1
PIP_CACHE_DIR = {envdir}/.cache

[testenv:py34-pure]
[testenv:py35-pure]
setenv =
PURE_PYTHON=1
PIP_CACHE_DIR = {envdir}/.cache
Expand All @@ -36,6 +38,8 @@ commands =
coverage report
coverage html
coverage xml
depends = py27,py27-pure,py35,py35-pure,py36,py37,pypy,pypy3
parallel_show_output = true

[testenv:docs]
basepython =
Expand Down

0 comments on commit d603267

Please sign in to comment.