Drop support for Python < 3.4.

This commit is contained in:
Chris PeBenito 2017-09-16 14:19:32 -04:00
parent 58f62bf627
commit e292a77c52
10 changed files with 9 additions and 21 deletions

View File

@ -5,11 +5,9 @@
language: python language: python
python: python:
- "3.3"
- "3.4" - "3.4"
- "3.5" - "3.5"
- "3.6" - "3.6"
- "2.7"
matrix: matrix:
fast_finish: true fast_finish: true

View File

@ -14,10 +14,9 @@ SETools uses the Python setuptools build system to build, and install.
As such it contains a setup.py script that will install the tools. As such it contains a setup.py script that will install the tools.
To run SETools command line tools, the following packages are required: To run SETools command line tools, the following packages are required:
* Python 2.7 or 3.3+ * Python 3.4+
* NetworkX 1.8+ * NetworkX 1.8+
* setuptools * setuptools
* enum34 (on Python 2.7 and 3.3 only)
* libselinux Python bindings (optional but recommended) * libselinux Python bindings (optional but recommended)
To run SETools graphical tools, the following packages are also required: To run SETools graphical tools, the following packages are also required:
@ -35,7 +34,6 @@ addition to the development packages from the above list:
To run SETools unit tests, the following packages are required, in To run SETools unit tests, the following packages are required, in
addition to the above dependencies: addition to the above dependencies:
* mock (on Python 2.7 only)
* tox (optional) * tox (optional)
### Obtaining SETools ### Obtaining SETools

2
apol
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Copyright 2015, Tresys Technology, LLC # Copyright 2015, Tresys Technology, LLC
# #
# This file is part of SETools. # This file is part of SETools.

2
sediff
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Copyright 2015-2016, Tresys Technology, LLC # Copyright 2015-2016, Tresys Technology, LLC
# #
# This file is part of SETools. # This file is part of SETools.

2
sedta
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Copyright 2014-2015, Tresys Technology, LLC # Copyright 2014-2015, Tresys Technology, LLC
# #
# This file is part of SETools. # This file is part of SETools.

2
seinfo
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Copyright 2014-2015, Tresys Technology, LLC # Copyright 2014-2015, Tresys Technology, LLC
# #
# This file is part of SETools. # This file is part of SETools.

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Copyright 2014-2015, Tresys Technology, LLC # Copyright 2014-2015, Tresys Technology, LLC
# #
# This file is part of SETools. # This file is part of SETools.

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Copyright 2014-2015, Tresys Technology, LLC # Copyright 2014-2015, Tresys Technology, LLC
# #
# This file is part of SETools. # This file is part of SETools.

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
from __future__ import print_function from __future__ import print_function
import glob import glob
from setuptools import setup from setuptools import setup

10
tox.ini
View File

@ -1,6 +1,6 @@
[tox] [tox]
minversion = 1.4 minversion = 1.4
envlist = py27, py33, py34, py35 envlist = py34, py35, py36
# Using site packages is not optimal, # Using site packages is not optimal,
# but libselinux bindings are not # but libselinux bindings are not
# available via PyPI. # available via PyPI.
@ -18,21 +18,16 @@ commands = pep8 --version
pep8 setools/ setoolsgui/ tests/ seinfo seinfoflow sedta sesearch sediff --statistics pep8 setools/ setoolsgui/ tests/ seinfo seinfoflow sedta sesearch sediff --statistics
[testenv:coverage] [testenv:coverage]
basepython = python3.3
deps = networkx==1.9 deps = networkx==1.9
coverage coverage
enum34
commands = coverage --version commands = coverage --version
coverage erase coverage erase
coverage run setup.py test coverage run setup.py test
coverage report coverage report
[testenv:lint] [testenv:lint]
basepython = python3.3
deps = pylint deps = pylint
networkx==1.9 networkx==1.9
mock
enum34
commands = {envpython} setup.py build_ext -i commands = {envpython} setup.py build_ext -i
pylint --version pylint --version
pylint -E --rcfile .pylintrc setools tests seinfo seinfoflow sedta sesearch sediff pylint -E --rcfile .pylintrc setools tests seinfo seinfoflow sedta sesearch sediff
@ -41,8 +36,5 @@ commands = {envpython} setup.py build_ext -i
[testenv] [testenv]
deps = networkx==1.9 deps = networkx==1.9
py27: mock
py27: enum34
py33: enum34
commands = {envpython} setup.py test commands = {envpython} setup.py test
recreate = True recreate = True