Fix CI and drop support for py35

.travis.yml

@@ -1,15 +1,17 @@
 ---
 language: python
 dist: xenial
+services:
+  - docker
 # Build only commits on master and release tags for the "Build pushed branches" feature.
 # This prevents building twice on PRs originating from our repo ("Build pushed pull requests)".
 # See:
 #   - https://github.com/travis-ci/travis-ci/issues/1147
 #   - https://docs.travis-ci.com/user/pull-requests/#double-builds-on-pull-requests
-branches:
-  only:
-    - master
-    - /^\d+\.\d+(\.\d+)?(-\S*)?$/
+# branches:
+#   only:
+#     - master
+#     - /^\d+\.\d+(\.\d+)?(-\S*)?$/
 
 cache:
   bundler: true
@@ -28,6 +30,14 @@ stages:
 before_install:
   - pip install --upgrade tox tox-venv
   - rm -rf .tox
+# Launch a Jira instance in detached mode
+  - docker run -dit -p 2990:2990 --name jira addono/jira-software-standalone
+# Wait until Jira has booted
+  - until $(curl -u $CI_JIRA_ADMIN:$CI_JIRA_ADMIN_PASSWORD --output /dev/null --silent --head --fail $CI_JIRA_URL/rest/api/2/permissions); do sleep 5; done
+# Install this repository, as we will need it in the next step
+  - pip install .
+# Attempt to create the test user, as the empty JIRA instance isn't provisioned with one
+  - (python -c "from jira import JIRA; JIRA('$CI_JIRA_URL', basic_auth=('$CI_JIRA_ADMIN', '$CI_JIRA_ADMIN_PASSWORD')).add_user('$CI_JIRA_USER', '[email protected]', password='$CI_JIRA_USER_PASSWORD')" && echo "Created user '$CI_JIRA_USER'") || (echo "Failed creating user '$CI_JIRA_USER'" && docker logs --tail 500 jira)
 notifications:
   email:
     - [email protected]
@@ -72,5 +82,9 @@ jobs:
             branch: master
 env:
   global:
-    - secure: "pGQGM5YmHvOgaKihOyzb3k6bdqLQnZQ2OXO9QrfXlXwtop3zvZQi80Q+01l230x2psDWlwvqWTknAjAt1w463fYXPwpoSvKVCsLSSbjrf2l56nrDqnoir+n0CBy288+eIdaGEfzcxDiuULeKjlg08zrqjcjLjW0bDbBrlTXsb5U="
     - PIP_DISABLE_PIP_VERSION_CHECK=1
+    - CI_JIRA_URL=http://localhost:2990/jira
+    - CI_JIRA_ADMIN=admin
+    - CI_JIRA_ADMIN_PASSWORD=admin
+    - CI_JIRA_USER=jira_user
+    - CI_JIRA_USER_PASSWORD=jira

jira/client.py

@@ -481,9 +481,8 @@ def __init__(
             self._create_kerberos_session(timeout, kerberos_options=kerberos_options)
         elif auth:
             self._create_cookie_auth(auth, timeout)
-            validate = (
-                True
-            )  # always log in for cookie based auth, as we need a first request to be logged in
+            # always log in for cookie based auth, as we need a first request to be logged in
+            validate = True
         else:
             verify = self._options["verify"]
             self._session = ResilientSession(timeout=timeout)

make_local_jira_user.py

@@ -0,0 +1,16 @@
+from jira import JIRA
+from os import environ
+
+
+try:
+    JIRA(
+        environ["CI_JIRA_URL"],
+        basic_auth=(environ["CI_JIRA_ADMIN"], environ["CI_JIRA_ADMIN_PASSWORD"]),
+    ).add_user(
+        environ["CI_JIRA_USER"],
+        "[email protected]",
+        password=environ["CI_JIRA_USER_PASSWORD"],
+    )
+except Exception as e:
+    if not "username already exists" in str(e):
+        raise e

setup.cfg

@@ -1,24 +1,24 @@
 [metadata]
 name = jira
 author = Ben Speakmon
-author-email = [email protected]
+author_email = [email protected]
 maintainer = Sorin Sbarnea
-maintainer-email = [email protected]
+maintainer_email = [email protected]
 summary = Python library for interacting with JIRA via REST APIs.
-long-description = file: README.rst
+long_description = file: README.rst
 # Do not include ChangeLog in description-file due to multiple reasons:
 # - Unicode chars, see https://github.com/pycontribs/jira/issues/512
 # - Breaks ability to perform `python setup.py install`
-long-description-content-type = text/x-rst; charset=UTF-8
-home-page = https://github.com/pycontribs/jira
-project-urls =
+long_description_content_type = text/x-rst; charset=UTF-8
+url = https://github.com/pycontribs/jira
+project_urls =
     Bug Tracker = https://github.com/pycontribs/jira/issues
     Release Management = https://github.com/pycontribs/jira/projects
     CI: Travis = https://travis-ci.com/pycontribs/jira
     Source Code = https://github.com/pycontribs/jira.git
     Documentation = https://jira.readthedocs.io/en/master/
     Forum = https://community.atlassian.com/t5/tag/jira-python/tg-p?sort=recent
-requires-python = >=3.5
+requires_python = >=3.5
 platforms = any
 license = BSD
 classifiers =

tox.ini

@@ -47,14 +47,22 @@ extras =
     test
 sitepackages=False
 commands=
-    bash -c 'find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf'
+    git clean -xdf jira tests
+    ; bash -c 'find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf'
     python -m pip check
+    python make_local_jira_user.py
     python -m pytest {posargs}
 setenv =
     PIP_LOG={envdir}/pip.log
     PIP_DISABLE_PIP_VERSION_CHECK=1
     # Avoid 2020-01-01 warnings: https://github.com/pypa/pip/issues/6207
     PYTHONWARNINGS=ignore:DEPRECATION::pip._internal.cli.base_command
+    CI_JIRA_URL=http://localhost:2990/jira
+    CI_JIRA_ADMIN=admin
+    CI_JIRA_ADMIN_PASSWORD=admin
+    CI_JIRA_USER=jira_user
+    CI_JIRA_USER_PASSWORD=jira
+    CI_JIRA_ISSUE=Task
 passenv =
     CI
     CI_JIRA_*
@@ -65,6 +73,8 @@ passenv =
     TRAVIS*
     TWINE_*
     XDG_CACHE_HOME
+    # For Windows users, getpass.get_user() needs USERNAME
+    USERNAME
 envars =
     PIP_DISABLE_PIP_VERSION_CHECK=1
     PIP_USER=no
@@ -85,7 +95,8 @@ deps =
     twine>=2.0.0
     wheel>=0.33.6
 commands =
-    rm -rf {toxinidir}/dist
+    git clean -xdf dist
+    ; rm -rf {toxinidir}/dist
     python setup.py check -m -s
     # disabled due to errors with older setuptools:
     # python setup.py sdist bdist_wheel