Merge pull request #306 from transifex/support-python3.9

Support Python 3.9

.circleci/config.yml

@@ -5,8 +5,14 @@ jobs:
     environment:
       CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      TOX_PY2: 2.7.13
-      TOX_PY3: 3.8.0
+      TOX_PY2: '2.7'
+      TOX_PY3: '3.9'
+      # NOTE(honles): The following are the official names, but point releases
+      # will likely be aliased as above pending either:
+      # - https://github.com/randomknowledge/docker-pyenv-tox/pull/6
+      # - https://github.com/randomknowledge/docker-pyenv-tox/pull/7
+      TOX_PY2_FALLBACK: 2.7.13
+      TOX_PY3_FALLBACK: 3.9.0
     # To see the list of pre-built images that CircleCI provides for most
     # common languages see
     # https://circleci.com/docs/2.0/circleci-images/
@@ -38,9 +44,24 @@ jobs:
     # This is based on your 1.0 configuration file or project settings
     - run: pip -V
     - run: pip install -U ipdb
-    - run: pyenv install -s $TOX_PY2
-    - run: pyenv install -s $TOX_PY3
-    - run: pyenv local $TOX_PY2 $TOX_PY3
+    # allow installing pyenv versions not in the base image
+    - run: |
+        if ! pyenv install -s $TOX_PY2; then
+          TOX_PY2=$TOX_PY2_FALLBACK
+          PYENV_UPDATED=1
+          # update pyenv just in case
+          : $(cd /pyenv/ && git pull)
+          pyenv install -s $TOX_PY2
+        fi
+
+        if ! pyenv install -s $TOX_PY3; then
+          TOX_PY3=$TOX_PY3_FALLBACK
+          # if not already updated, update pyenv
+          test -z "$PYENV_UPDATED" && : $(cd /pyenv/ && git pull)
+          pyenv install -s $TOX_PY3
+        fi
+
+        pyenv local $TOX_PY2 $TOX_PY3
     # Save dependency cache
     - save_cache:
         key: txclient-{{ .Branch }}-{{ epoch }}

requirements.txt

@@ -3,3 +3,4 @@ six<2.0.0
 requests>=2.19.1,<3.0.0
 python-slugify<5.0.0
 gitpython<4.0.0
+

setup.py

@@ -24,7 +24,7 @@ def get_file_content(filename):
     license="GPLv2",
     dependency_links=[],
     setup_requires=[],
-    python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,<3.9",
+    python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,<3.10",
     install_requires=get_file_content("requirements.txt").splitlines(),
     tests_require=["mock>=3.0.5,<4.0"],
     data_files=[],
@@ -42,5 +42,6 @@ def get_file_content(filename):
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
     ],
 )

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,38}-{vanilla,pyopenssl}
+envlist = py{27,39}-{vanilla,pyopenssl}
 
 [testenv]
 deps =
@@ -14,4 +14,4 @@ passenv = TOX_* TRANSIFEX_USER TRANSIFEX_TOKEN TRANSIFEX_PROJECT CI CI_* CIRCLEC
 commands = python -V
            coverage run setup.py test
            bash ./contrib/test_build.sh
-           bash -c 'test -n "$CI" && codecov -e TOX_ENV_NAME'
+           bash -c 'if [ -n "$CI" ]; then codecov -e TOX_ENV_NAME; fi'