Skip to content

Commit

Permalink
Merge 0726b8d into 5fe609f
Browse files Browse the repository at this point in the history
  • Loading branch information
mgedmin committed Jul 25, 2019
2 parents 5fe609f + 0726b8d commit 86488b4
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 21 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ coverage.xml
dist
.eggs/
.dir-locals.el
pip-wheel-metadata/
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
9 changes: 1 addition & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
language: python
sudo: false
dist: xenial
matrix:
include:
- os: linux
python: 2.7
- os: linux
python: 2.7
env: PURE_PYTHON=1
- os: linux
python: 3.4
- os: linux
python: 3.5
- os: linux
Expand All @@ -21,8 +19,6 @@ matrix:
- WITH_COVERAGE=1
- os: linux
python: 3.7
dist: xenial
sudo: true
- os: linux
python: pypy
- os: linux
Expand All @@ -33,9 +29,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: 3 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
``BTrees`` Changelog
====================

4.5.2 (unreleased)
4.6.0 (unreleased)
------------------

- Drop support for Python 3.4.

- Fix tests against persistent 4.4.

- Stop accidentally installing the 'terryfy' package in macOS wheels.
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
15 changes: 7 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
##############################################################################
from __future__ import print_function
version = '4.5.2.dev0'
version = '4.6.0.dev0'

import os
import sys
Expand Down Expand Up @@ -153,13 +153,12 @@ def BTreeExtension(family):
"Development Status :: 6 - Mature",
"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.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Framework :: ZODB",
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ envlist =
# Jython support pending 2.7 support, due 2012-07-15 or so. See:
# http://fwierzbicki.blogspot.com/2012/03/adconion-to-fund-jython-27.html
# py27,jython,pypy,coverage,docs
py27,py27-pure,pypy,py34,py35,py35-pure,py36,py37,pypy3,w_zodb,coverage,docs
py27,py27-pure,py35,py35-pure,py36,py37,pypy,pypy3,w_zodb,coverage,docs

[testenv]
usedevelop = true
Expand Down

0 comments on commit 86488b4

Please sign in to comment.