diff --git a/.travis.yml b/.travis.yml index 81141d5..5e0e522 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,6 @@ language: python cache: pip dist: xenial python: - - "2.7" - - "3.4" - "3.5" - "3.6" - "3.7" @@ -13,9 +11,9 @@ install: - pip install -U pip setuptools - pip install tox-travis - pip install codecov - - if [[ $TRAVIS_PYTHON_VERSION != 3.4 ]]; then pip install pre-commit; fi + - pip install pre-commit script: - tox - - if [[ $TRAVIS_PYTHON_VERSION != 3.4 ]]; then pre-commit run --all-files; fi + - pre-commit run --all-files after_success: - codecov diff --git a/setup.py b/setup.py index d4daa16..ca63890 100644 --- a/setup.py +++ b/setup.py @@ -39,10 +39,7 @@ setup( 'Intended Audience :: Developers', 'Topic :: Security', 'License :: OSI Approved :: BSD License', - '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', @@ -51,7 +48,6 @@ setup( keywords='stix stix2 json cti cyber threat intelligence', packages=find_packages(exclude=['*.test', '*.test.*']), install_requires=[ - 'enum34 ; python_version<"3.4"', 'pytz', 'requests', 'simplejson', diff --git a/tox.ini b/tox.ini index d34aac1..328c03a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py34,py35,py36,py37,py38,style,isort-check,packaging +envlist = py35,py36,py37,py38,style,isort-check,packaging [testenv] deps = @@ -42,8 +42,6 @@ commands = [travis] python = - 2.7: py27, style - 3.4: py34 3.5: py35 3.6: py36 3.7: py37