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

Nomore py26 #2822

Merged
merged 3 commits into from
Oct 10, 2017
Merged

Nomore py26 #2822

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88366b3
start the removal of python 2.6/3.3 support
RonnyPfannschmidt Oct 9, 2017
73ff53c
remove eol python from the ci config
RonnyPfannschmidt Oct 9, 2017
c486598
remove some support code for old python versions
RonnyPfannschmidt Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
start the removal of python 2.6/3.3 support
  • Loading branch information
@RonnyPfannschmidt
RonnyPfannschmidt committed Oct 9, 2017
commit 88366b393ce1501ac73351239838fd5fa708c115
1 change: 1 addition & 0 deletions changelog/2812.removal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
remove support for the eol python versions 2.6 and 3.3
17 changes: 9 additions & 8 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'Topic :: Utilities',
] + [
('Programming Language :: Python :: %s' % x)
for x in '2 2.6 2.7 3 3.3 3.4 3.5 3.6'.split()
for x in '2.7 3 3.4 3.5 3.6'.split()
]

with open('README.rst') as fd:
Expand Down Expand Up @@ -50,12 +50,8 @@ def main():
install_requires.append('pluggy>=0.4.0,<0.5')
extras_require = {}
if has_environment_marker_support():
extras_require[':python_version=="2.6"'] = ['argparse', 'ordereddict']
extras_require[':sys_platform=="win32"'] = ['colorama']
else:
if sys.version_info < (2, 7):
install_requires.append('argparse')
install_requires.append('ordereddict')
if sys.platform == 'win32':
install_requires.append('colorama')

Expand All @@ -69,9 +65,11 @@ def main():
url='http://pytest.org',
license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
author='Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin and others',
entry_points={'console_scripts':
['pytest=pytest:main', 'py.test=pytest:main']},
author=(
'Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, '
'Floris Bruynooghe, Brianna Laugher, Florian Bruhin and others'),
entry_points={'console_scripts': [
'pytest=pytest:main', 'py.test=pytest:main']},
classifiers=classifiers,
keywords="test unittest",
cmdclass={'test': PyTest},
Expand All @@ -87,10 +85,13 @@ def main():

class PyTest(Command):
user_options = []

def initialize_options(self):
pass

def finalize_options(self):
pass

def run(self):
import subprocess
PPATH = [x for x in os.environ.get('PYTHONPATH', '').split(':') if x]
Expand Down
12 changes: 2 additions & 10 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ distshare = {homedir}/.tox/distshare
# make sure to update environment list in travis.yml and appveyor.yml
envlist =
linting
py26
py27
py33
py34
Expand All @@ -27,13 +26,6 @@ deps =
mock
requests

[testenv:py26]
# pinning mock to last supported version for python 2.6
deps =
hypothesis<3.0
nose
mock<1.1

[testenv:py27-subprocess]
changedir = .
deps =
Expand All @@ -54,7 +46,7 @@ deps =
pygments
restructuredtext_lint
commands =
flake8 pytest.py _pytest testing
flake8 pytest.py _pytest testing setup.py pytest.py
{envpython} scripts/check-rst.py

[testenv:py27-xdist]
Expand Down Expand Up @@ -174,7 +166,7 @@ usedevelop = True
deps =
autopep8
commands =
autopep8 --in-place -r --max-line-length=120 --exclude=test_source_multiline_block.py _pytest testing
autopep8 --in-place -r --max-line-length=120 --exclude=test_source_multiline_block.py _pytest testing setup.py pytest.py

[testenv:jython]
changedir = testing
Expand Down