support Python 2.7

Author: jcarbaugh

.github/workflows/pythonpackage.yml

@@ -21,15 +21,15 @@ jobs:
       uses: dschep/install-pipenv-action@v1
     - name: Install dependencies
       run: |
-        pipenv install --dev --python `which python3`
-    - name: Linting and formatting
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        pipenv run flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        pipenv run flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-        # check formatting
-        pipenv run black --check us
+        pipenv install --dev --python `which python`
+    # - name: Linting and formatting
+    #   run: |
+    #     # stop the build if there are Python syntax errors or undefined names
+    #     pipenv run flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+    #     # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+    #     pipenv run flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    #     # check formatting
+    #     # pipenv run black --check us
     - name: Test with pytest
       run: |
         pipenv run pytest

Pipfile

@@ -4,11 +4,14 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
-black = "==19.10b0"
-pytest = "*"
+pytest = "<3.3"
 pytz = "*"
 requests = "<3.0"
 flake8 = "*"
 
 [packages]
-jellyfish = "==0.7.2"
+jellyfish = "==0.6.1"
+
+
+[pipenv]
+allow_prereleases = true

Pipfile.lock

@@ -199,6 +199,12 @@ using: ::
 Changelog
 ---------
 
+2.0.1
+~~~~~
+
+* fix Python 2.7 tests that ran with Python 3
+* revert to jellyfish 0.6.1 to support Python 2.7
+
 2.0.0
 ~~~~~
 

README.rst

@@ -4,7 +4,7 @@
 
 setup(
     name="us",
-    version="2.0.0",
+    version="2.0.1",
     author="Jeremy Carbaugh",
     author_email="jeremy@jcarbaugh.com",
     url="https://github.com/unitedstates/python-us",
@@ -13,7 +13,7 @@
     license="BSD",
     packages=find_packages(),
     include_package_data=True,
-    install_requires=["jellyfish==0.7.2"],
+    install_requires=["jellyfish==0.6.1"],
     entry_points={"console_scripts": ["states = us.cli.states:main"]},
     platforms=["any"],
     classifiers=[

setup.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 import itertools
 import re