From 48661e815725a278b1ed2d9acc25f467407369b2 Mon Sep 17 00:00:00 2001
From: Steven Esser <sesser@nexb.com>
Date: Thu, 8 Oct 2020 15:11:31 -0400
Subject: [PATCH 1/2] 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>
---
 .travis.yml    |  8 ++++++++
 CHANGELOG.rst  | 14 ++++++++++++++
 configure      |  2 +-
 pyproject.toml |  4 ++--
 setup.cfg      |  5 +++--
 5 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..90431446
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,8 @@
+language: python
+python:
+  - "2.7"
+  - "3.6"
+install:
+  - ./configure
+script:
+  - tmp/bin/pytest
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 117070bb..81e8402a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,5 +1,19 @@
 Release notes
 -------------
+### Upcoming Version
+
+*2020-10-08* -- Add support for both python 2 + 3
+*2020-10-08* -- Add CI support for python 2 + 3
+
+### Version 20.10
+
+* Minimal fixes needed for proper release
+
+### Version 20.09.30
+
+*2020-09-25* -- Update to PEP 517/518 development practices
+*2020-09-25* -- Add some minimal documentation
+
 ### Version 20.09
 
 *2020-09-24* -- Initial release.
diff --git a/configure b/configure
index a35c8c90..0a3e057b 100755
--- a/configure
+++ b/configure
@@ -18,7 +18,7 @@ fi
 
 
 if [[ "$PYTHON_EXE" == "" ]]; then
-    PYTHON_EXE=python3
+    PYTHON_EXE=python
 fi
 
 
diff --git a/pyproject.toml b/pyproject.toml
index e75f1cec..a2d0f767 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools >= 50", "wheel", "setuptools_scm[toml] >= 4"]
+requires = ["setuptools >= 44", "wheel", "setuptools_scm[toml] >= 4"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
@@ -43,4 +43,4 @@ addopts = [
     "-rfExXw",
     "--strict",
     "--doctest-modules"
-]
\ No newline at end of file
+]
diff --git a/setup.cfg b/setup.cfg
index d2a1f330..7f5f788f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,6 +25,7 @@ packages=find:
 include_package_data = true
 zip_safe = false
 install_requires =
+    backports.os == 0.1.1
     attrs >= 18.1, !=20.1.0
     click >= 6.0.0
     text_unidecode >= 1.0
@@ -40,5 +41,5 @@ where=src
 [options.extras_require]
 testing =
     # upstream
-    pytest >= 6
-    pytest-xdist >= 2
+    pytest >= 4
+    pytest-xdist >= 1

From 7339d30cc6620b86c2bb2136fbc15f44f74c0f4e Mon Sep 17 00:00:00 2001
From: Steven Esser <sesser@nexb.com>
Date: Thu, 8 Oct 2020 15:44:04 -0400
Subject: [PATCH 2/2] Add proper python_version identifier for backports.os

Signed-off-by: Steven Esser <sesser@nexb.com>
---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 7f5f788f..986bda5d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,7 +25,7 @@ packages=find:
 include_package_data = true
 zip_safe = false
 install_requires =
-    backports.os == 0.1.1
+    backports.os == 0.1.1; python_version < "3"
     attrs >= 18.1, !=20.1.0
     click >= 6.0.0
     text_unidecode >= 1.0