Merge pull request #418 from oasis-open/drop-old-python

Drop support for Python versions older than 3.5
pull/1/head
Emmanuelle Vargas-Gonzalez 2020-06-24 10:41:52 -04:00 committed by GitHub
commit 57b371903f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 11 deletions

View File

@ -3,8 +3,6 @@ language: python
cache: pip cache: pip
dist: xenial dist: xenial
python: python:
- "2.7"
- "3.4"
- "3.5" - "3.5"
- "3.6" - "3.6"
- "3.7" - "3.7"
@ -13,9 +11,9 @@ install:
- pip install -U pip setuptools - pip install -U pip setuptools
- pip install tox-travis - pip install tox-travis
- pip install codecov - pip install codecov
- if [[ $TRAVIS_PYTHON_VERSION != 3.4 ]]; then pip install pre-commit; fi - pip install pre-commit
script: script:
- tox - tox
- if [[ $TRAVIS_PYTHON_VERSION != 3.4 ]]; then pre-commit run --all-files; fi - pre-commit run --all-files
after_success: after_success:
- codecov - codecov

View File

@ -39,10 +39,7 @@ setup(
'Intended Audience :: Developers', 'Intended Audience :: Developers',
'Topic :: Security', 'Topic :: Security',
'License :: OSI Approved :: BSD License', 'License :: OSI Approved :: BSD License',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.7',
@ -51,7 +48,6 @@ setup(
keywords='stix stix2 json cti cyber threat intelligence', keywords='stix stix2 json cti cyber threat intelligence',
packages=find_packages(exclude=['*.test', '*.test.*']), packages=find_packages(exclude=['*.test', '*.test.*']),
install_requires=[ install_requires=[
'enum34 ; python_version<"3.4"',
'pytz', 'pytz',
'requests', 'requests',
'simplejson', 'simplejson',

View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = py27,py34,py35,py36,py37,py38,style,isort-check,packaging envlist = py35,py36,py37,py38,style,isort-check,packaging
[testenv] [testenv]
deps = deps =
@ -42,8 +42,6 @@ commands =
[travis] [travis]
python = python =
2.7: py27, style
3.4: py34
3.5: py35 3.5: py35
3.6: py36 3.6: py36
3.7: py37 3.7: py37