remove support for python 3.2.x and 3.3.x, require 3.4+, fixes #65, fixes #221

This commit is contained in:
Thomas Waldmann 2015-12-14 21:02:02 +01:00
parent de124aacd0
commit 7d591226d2
5 changed files with 5 additions and 30 deletions

View File

@ -8,26 +8,12 @@ cache:
matrix: matrix:
include: include:
- python: 3.2
os: linux
env: TOXENV=py32
- python: 3.3
os: linux
env: TOXENV=py33
- python: 3.4 - python: 3.4
os: linux os: linux
env: TOXENV=py34 env: TOXENV=py34
- python: 3.5 - python: 3.5
os: linux os: linux
env: TOXENV=py35 env: TOXENV=py35
- language: generic
os: osx
osx_image: xcode6.4
env: TOXENV=py32
- language: generic
os: osx
osx_image: xcode6.4
env: TOXENV=py33
- language: generic - language: generic
os: osx os: osx
osx_image: xcode6.4 osx_image: xcode6.4

View File

@ -18,21 +18,13 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
brew outdated pyenv || brew upgrade pyenv brew outdated pyenv || brew upgrade pyenv
case "${TOXENV}" in case "${TOXENV}" in
py32)
pyenv install 3.2.6
pyenv global 3.2.6
;;
py33)
pyenv install 3.3.6
pyenv global 3.3.6
;;
py34) py34)
pyenv install 3.4.3 pyenv install 3.4.3
pyenv global 3.4.3 pyenv global 3.4.3
;; ;;
py35) py35)
pyenv install 3.5.0 pyenv install 3.5.1
pyenv global 3.5.0 pyenv global 3.5.1
;; ;;
esac esac
pyenv rehash pyenv rehash

3
Vagrantfile vendored
View File

@ -161,7 +161,6 @@ end
def install_pythons(boxname) def install_pythons(boxname)
return <<-EOF return <<-EOF
. ~/.bash_profile . ~/.bash_profile
pyenv install 3.3.0 # tests
pyenv install 3.4.0 # tests pyenv install 3.4.0 # tests
pyenv install 3.5.0 # tests pyenv install 3.5.0 # tests
pyenv install 3.5.1 # binary build, use latest 3.5.x release pyenv install 3.5.1 # binary build, use latest 3.5.x release
@ -251,7 +250,7 @@ def run_tests(boxname)
. ../borg-env/bin/activate . ../borg-env/bin/activate
if which pyenv > /dev/null; then if which pyenv > /dev/null; then
# for testing, use the earliest point releases of the supported python versions: # for testing, use the earliest point releases of the supported python versions:
pyenv global 3.3.0 3.4.0 3.5.0 pyenv global 3.4.0 3.5.0
fi fi
# otherwise: just use the system python # otherwise: just use the system python
if which fakeroot > /dev/null; then if which fakeroot > /dev/null; then

View File

@ -7,7 +7,7 @@ from glob import glob
from distutils.command.build import build from distutils.command.build import build
from distutils.core import Command from distutils.core import Command
min_python = (3, 2) min_python = (3, 4)
my_python = sys.version_info my_python = sys.version_info
if my_python < min_python: if my_python < min_python:
@ -242,8 +242,6 @@ setup(
'Operating System :: POSIX :: Linux', 'Operating System :: POSIX :: Linux',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.5',
'Topic :: Security :: Cryptography', 'Topic :: Security :: Cryptography',

View File

@ -2,7 +2,7 @@
# fakeroot -u tox --recreate # fakeroot -u tox --recreate
[tox] [tox]
envlist = py{32,33,34,35} envlist = py{34,35}
[testenv] [testenv]
# Change dir to avoid import problem for cython code. The directory does # Change dir to avoid import problem for cython code. The directory does