Skip to content

Commit 48661e8

Browse files
committed
Re-Add support for python2
* Update configure script to use `python` by default * Lower build dependency version requirements to support python2 * Lower test dependency version requirements to support python2 * Re-add backports.os as an `installed_requires` dependency * Add Travis CI support for python 2 + 3 * Update CHANGELOG.rst Signed-off-by: Steven Esser <sesser@nexb.com>
1 parent 7893dbb commit 48661e8

5 files changed

Lines changed: 28 additions & 5 deletions

File tree

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
language: python
2+
python:
3+
- "2.7"
4+
- "3.6"
5+
install:
6+
- ./configure
7+
script:
8+
- tmp/bin/pytest

CHANGELOG.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
Release notes
22
-------------
3+
### Upcoming Version
4+
5+
*2020-10-08* -- Add support for both python 2 + 3
6+
*2020-10-08* -- Add CI support for python 2 + 3
7+
8+
### Version 20.10
9+
10+
* Minimal fixes needed for proper release
11+
12+
### Version 20.09.30
13+
14+
*2020-09-25* -- Update to PEP 517/518 development practices
15+
*2020-09-25* -- Add some minimal documentation
16+
317
### Version 20.09
418

519
*2020-09-24* -- Initial release.

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fi
1818

1919

2020
if [[ "$PYTHON_EXE" == "" ]]; then
21-
PYTHON_EXE=python3
21+
PYTHON_EXE=python
2222
fi
2323

2424

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools >= 50", "wheel", "setuptools_scm[toml] >= 4"]
2+
requires = ["setuptools >= 44", "wheel", "setuptools_scm[toml] >= 4"]
33
build-backend = "setuptools.build_meta"
44

55
[tool.setuptools_scm]
@@ -43,4 +43,4 @@ addopts = [
4343
"-rfExXw",
4444
"--strict",
4545
"--doctest-modules"
46-
]
46+
]

setup.cfg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ packages=find:
2525
include_package_data = true
2626
zip_safe = false
2727
install_requires =
28+
backports.os == 0.1.1
2829
attrs >= 18.1, !=20.1.0
2930
click >= 6.0.0
3031
text_unidecode >= 1.0
@@ -40,5 +41,5 @@ where=src
4041
[options.extras_require]
4142
testing =
4243
# upstream
43-
pytest >= 6
44-
pytest-xdist >= 2
44+
pytest >= 4
45+
pytest-xdist >= 1

0 commit comments

Comments
 (0)