Skip to content

Commit c44d4af

Browse files
committed
update project configuration and test harness
1 parent 7ae8cb5 commit c44d4af

4 files changed

Lines changed: 29 additions & 9 deletions

File tree

.travis.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
1+
os: linux
12
language: python
2-
3+
cache: pip
4+
dist: xenial
35
python:
4-
- "2.6"
56
- "2.7"
67
- "3.4"
78
- "3.5"
89
- "3.6"
9-
10+
- "3.7"
11+
- "3.8"
12+
jobs:
13+
include:
14+
# https://blog.travis-ci.com/2019-04-15-xenial-default-build-environment
15+
# https://travis-ci.community/t/issue-with-python-2-6-on-linux/3861/2
16+
- python: 2.6
17+
dist: trusty
1018
before_install:
1119
- sudo apt-get install -qq libxml2
12-
1320
install:
1421
- pip install -U tox-travis
15-
1622
script: tox
17-
1823
branches:
1924
only:
2025
- master
21-
2226
notifications:
2327
email:
2428
- stix-commits-list@groups.mitre.org

setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ tag = True
99
[bumpversion:file:sdv/version.py]
1010

1111
[bumpversion:file:docs/getting_started.rst]
12+
13+
[metadata]
14+
license_file = LICENSE.txt

setup.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,22 @@ def get_version():
3131
readme = f.read()
3232

3333
install_requires = [
34-
'lxml>=3.3.5',
3534
'xlrd>=0.9.2',
3635
'ordereddict',
3736
'mixbox>=1.0.5',
3837
'python-dateutil'
3938
]
4039

40+
# lxml has dropped support for Python 2.6, 3.3 after version 4.2.6
41+
if (py_maj, py_minor) == (2, 6) or (py_maj, py_minor) == (3, 3):
42+
install_requires.append('lxml>=3.3.5,<4.3.0')
43+
# lxml has dropped support for Python 2.6, 3.3, 3.4 after version 4.4.0
44+
elif (py_maj, py_minor) == (2, 6) or (py_maj, py_minor) == (3, 4):
45+
install_requires.append('lxml>=3.3.5,<4.4.0')
46+
else:
47+
install_requires.append('lxml>=3.3.5')
48+
49+
4150
# Python 2.6 does not come with argparse
4251
try:
4352
import argparse
@@ -90,5 +99,7 @@ def get_version():
9099
'Programming Language :: Python :: 3.4',
91100
'Programming Language :: Python :: 3.5',
92101
'Programming Language :: Python :: 3.6',
102+
'Programming Language :: Python :: 3.7',
103+
'Programming Language :: Python :: 3.8',
93104
]
94105
)

tox.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py26, py27, py34, py35, py36
2+
envlist = py26, py27, py34, py35, py36, py37, py38
33

44
[testenv]
55
commands =
@@ -23,3 +23,5 @@ python =
2323
3.4: py34
2424
3.5: py35
2525
3.6: py36
26+
3.7: py37
27+
3.8: py38

0 commit comments

Comments
 (0)