Skip to content

Commit

Permalink
drop Python 2.6 support; remove old hacks which are no longer needed
Browse files Browse the repository at this point in the history
  • Loading branch information
kmike committed Dec 7, 2016
1 parent 5e4ed34 commit 8531f53
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 17 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ language: python
python: 3.5
sudo: false
env:
- TOXENV=py26
- TOXENV=py27
- TOXENV=py33
- TOXENV=py34
Expand Down
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
if sys.platform == 'win32':
includes.extend(['crfsuite/win32', 'include'])


class build_ext_check_gcc(build_ext):
def build_extensions(self):
c = self.compiler
Expand All @@ -34,12 +35,14 @@ def build_extensions(self):
e.extra_compile_args=['-std=c99']
build_ext.build_extensions(self)


ext_modules = [Extension('pycrfsuite._pycrfsuite',
include_dirs=includes,
language='c++',
sources=sources
)]


setup(
name='python-crfsuite',
version="0.8.4",
Expand All @@ -56,7 +59,6 @@ def build_extensions(self):
"Programming Language :: Cython",
"Programming Language :: Python",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.3",
Expand All @@ -71,5 +73,5 @@ def build_extensions(self):
zip_safe=False,
packages=['pycrfsuite'],
ext_modules=ext_modules,
cmdclass={'build_ext' : build_ext_check_gcc}
cmdclass={'build_ext': build_ext_check_gcc}
)
15 changes: 1 addition & 14 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,22 +1,9 @@
[tox]
envlist = py26,py27,py33,py34
envlist = py27,py33,py34,py35

[testenv]
changedir = {envtmpdir}
deps =
pytest
commands =
; a workaround for tox bug: https://bitbucket.org/hpk42/tox/issue/176/tox-doesnt-install-the-package-being
pip install -I {toxinidir}/

; run tests
py.test {toxinidir}/tests --doctest-modules {posargs}
setenv=
; a workaround for OS X Mavericks bug
ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future

[testenv:py26]
deps =
pytest
argparse

0 comments on commit 8531f53

Please sign in to comment.