Skip to content

Commit

Permalink
Drop py36 py37 add py310 (pycontribs#1350)
Browse files Browse the repository at this point in the history
  • Loading branch information
adehad authored Apr 13, 2022
1 parent 97ed6d7 commit e4ee990
Show file tree
Hide file tree
Showing 11 changed files with 71 additions and 71 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/jira_server_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ["3.6", "3.7", "3.8", "3.9"]
python-version: ["3.8", "3.9", "3.10"]
jira-version: [8.17.1]

steps:
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repos:
- id: black
language_version: python3
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
rev: v4.2.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
Expand Down Expand Up @@ -46,15 +46,15 @@ repos:
- id: yamllint
files: \.(yaml|yml)$
- repo: https://github.com/pre-commit/mirrors-mypy.git
rev: v0.931
rev: v0.942
hooks:
- id: mypy
additional_dependencies:
- types-requests
- types-pkg_resources
args: [--no-strict-optional, --ignore-missing-imports, --show-error-codes]
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.0
rev: v2.32.0
hooks:
- id: pyupgrade
args: [ --py36-plus ]
args: [--py38-plus]
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build:
image: latest

python:
version: 3.7
version: 3.8
install:
- method: pip
path: .
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Setup
* Run tests
- ``tox``
* Run tests for one env only
- ``tox -e py37``
- ``tox -e py38``
* Specify what tests to run with pytest_
- ``tox -e py39 -- tests/resources/test_attachment.py``
* Debug tests with breakpoints by disabling the coverage plugin, with the ``--no-cov`` argument.
Expand Down
102 changes: 53 additions & 49 deletions constraints.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#
# This file is autogenerated by pip-compile with python 3.6
# This file is autogenerated by pip-compile with python 3.10
# To update, run:
#
# pip-compile --extra=async --extra=cli --extra=docs --extra=opt --extra=test --output-file=constraints.txt --strip-extras setup.cfg
#
alabaster==0.7.12
# via sphinx
appnope==0.1.2
# via ipython
asttokens==2.0.5
# via stack-data
atomicwrites==1.4.0
# via pytest
attrs==21.4.0
# via pytest
babel==2.9.1
Expand All @@ -20,22 +22,22 @@ cffi==1.15.0
# via cryptography
charset-normalizer==2.0.12
# via requests
coverage==6.1.2
colorama==0.4.4
# via
# ipython
# pytest
# sphinx
coverage==6.3.2
# via pytest-cov
cryptography==36.0.1
cryptography==36.0.2
# via
# pyspnego
# requests-kerberos
dataclasses==0.8
# via pyspnego
decorator==5.1.1
# via
# gssapi
# ipython
# traitlets
# via ipython
defusedxml==0.7.1
# via jira (setup.cfg)
docutils==0.18.1
docutils==0.17.1
# via
# jira (setup.cfg)
# sphinx
Expand All @@ -44,39 +46,34 @@ execnet==1.9.0
# via
# pytest-cache
# pytest-xdist
executing==0.8.3
# via stack-data
filemagic==1.6
# via jira (setup.cfg)
flaky==3.7.0
# via jira (setup.cfg)
gssapi==1.7.3
# via pyspnego
idna==3.3
# via requests
imagesize==1.3.0
# via sphinx
importlib-metadata==4.8.2
# via
# keyring
# pluggy
# pytest
importlib-metadata==4.11.3
# via keyring
iniconfig==1.1.1
# via pytest
ipython==7.16.1
ipython==8.2.0
# via jira (setup.cfg)
ipython-genutils==0.2.0
# via traitlets
jedi==0.18.1
# via ipython
jinja2==3.0.3
jinja2==3.1.1
# via sphinx
keyring==23.2.1
keyring==23.5.0
# via jira (setup.cfg)
krb5==0.3.0
# via pyspnego
markupsafe==2.0.1
markupsafe==2.1.1
# via
# jinja2
# jira (setup.cfg)
matplotlib-inline==0.1.3
# via ipython
oauthlib==3.2.0
# via
# jira (setup.cfg)
Expand All @@ -88,16 +85,14 @@ packaging==21.3
# sphinx
parso==0.8.3
# via jedi
pexpect==4.8.0
# via ipython
pickleshare==0.7.5
# via ipython
pluggy==1.0.0
# via pytest
prompt-toolkit==3.0.28
prompt-toolkit==3.0.29
# via ipython
ptyprocess==0.7.0
# via pexpect
pure-eval==0.2.2
# via stack-data
py==1.11.0
# via
# jira (setup.cfg)
Expand All @@ -113,11 +108,11 @@ pyjwt==2.3.0
# via
# jira (setup.cfg)
# requests-jwt
pyparsing==2.4.7
pyparsing==3.0.7
# via packaging
pyspnego==0.5.0
pyspnego==0.5.1
# via requests-kerberos
pytest==6.2.5
pytest==7.1.1
# via
# jira (setup.cfg)
# pytest-cache
Expand All @@ -141,8 +136,10 @@ pytest-timeout==2.1.0
# via jira (setup.cfg)
pytest-xdist==2.5.0
# via jira (setup.cfg)
pytz==2021.3
pytz==2022.1
# via babel
pywin32-ctypes==0.2.0
# via keyring
pyyaml==6.0
# via jira (setup.cfg)
requests==2.27.1
Expand All @@ -154,7 +151,7 @@ requests==2.27.1
# requests-mock
# requests-oauthlib
# requests-toolbelt
# requires.io
# requires-io
# sphinx
requests-futures==1.0.0
# via jira (setup.cfg)
Expand All @@ -168,15 +165,15 @@ requests-oauthlib==1.3.1
# via jira (setup.cfg)
requests-toolbelt==0.9.1
# via jira (setup.cfg)
requires.io==0.2.6
requires-io==0.2.6
# via jira (setup.cfg)
six==1.16.0
# via
# asttokens
# requests-mock
# traitlets
snowballstemmer==2.2.0
# via sphinx
sphinx==4.4.0
sphinx==4.5.0
# via
# jira (setup.cfg)
# sphinx-rtd-theme
Expand All @@ -194,19 +191,23 @@ sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
# via sphinx
stack-data==0.2.0
# via ipython
tenacity==8.0.1
# via jira (setup.cfg)
termcolor==1.1.0
# via pytest-sugar
toml==0.10.2
# via pytest
tomli==1.2.3
# via coverage
traitlets==4.3.3
# via ipython
tomli==2.0.1
# via
# coverage
# pytest
traitlets==5.1.1
# via
# ipython
# matplotlib-inline
typing-extensions==4.1.1
# via importlib-metadata
urllib3==1.26.8
# via jira (setup.cfg)
urllib3==1.26.9
# via requests
wcwidth==0.2.5
# via prompt-toolkit
Expand All @@ -216,5 +217,8 @@ xmlrunner==1.7.7
# via jira (setup.cfg)
yanc==0.3.3
# via jira (setup.cfg)
zipp==3.6.0
zipp==3.8.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
1 change: 0 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@

nitpick_ignore = [
("py:class", "JIRA"), # in jira.resources we only import this class if type
("py:obj", "typing.ResourceType"), # only Py36 has a problem with this reference
("py:class", "jira.resources.AnyLike"), # Dummy subclass for type checking
# From other packages
("py:mod", "filemagic"),
Expand Down
2 changes: 1 addition & 1 deletion docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Issues and Feature Requests
* How to recreate the bug.
* If relevant, including the versions of your:

* Python interpreter (3.6, etc)
* Python interpreter (3.8, etc)
* jira-python
* Operating System and Version (Windows 7, OS X 10.10, Ubuntu 14.04, etc.)
* IPython if using jirashell
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Source packages are also available at PyPI:
Dependencies
============

Python >3.5 is required.
Python >=3.8 is required.

- :py:mod:`requests` - `python-requests <https://pypi.org/project/requests/>`_ library handles the HTTP business. Usually, the latest version available at time of release is the minimum version required; at this writing, that version is 1.2.0, but any version >= 1.0.0 should work.
- :py:mod:`requests-oauthlib` - Used to implement OAuth. The latest version as of this writing is 1.3.0.
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ requires = [
"setuptools_scm_git_archive >= 1.0",
"wheel",
]
requires-python = ">3.5"
requires-python = ">=3.8"
build-backend = "setuptools.build_meta"
11 changes: 5 additions & 6 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ project_urls =
Source Code = https://github.com/pycontribs/jira.git
Documentation = https://jira.readthedocs.io
Forum = https://community.atlassian.com/t5/tag/jira-python/tg-p?sort=recent
requires_python = >=3.6
requires_python = >=3.8
platforms = any
license = BSD
classifiers =
Expand All @@ -31,10 +31,9 @@ classifiers =
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Topic :: Software Development :: Libraries :: Python Modules
Topic :: Internet :: WWW/HTTP
keywords = api, atlassian, jira, rest, web
Expand All @@ -45,7 +44,7 @@ packages =

[options]
use_scm_version = True
python_requires = >=3.6
python_requires = >=3.8
packages = find:
include_package_data = True
zip_safe = False
Expand Down Expand Up @@ -86,7 +85,7 @@ test =
pytest-sugar
pytest-timeout>=1.3.1
pytest-xdist>=2.2
pytest>=6.0.0,<7.0 # MIT
pytest>=6.0.0 # MIT
PyYAML>=5.1 # MIT
requests_mock # Apache-2
requires.io # UNKNOWN!!!
Expand Down Expand Up @@ -164,4 +163,4 @@ markers =
allow_on_cloud: opt in for the test to run on Jira Cloud

[mypy]
python_version = 3.6
python_version = 3.8
8 changes: 3 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,18 @@ requires =
tox-extra
tox-pyenv
envlist =
py310
py39
py38
py37
py36
ignore_basepython_conflict = True
skip_missing_interpreters = True
skipdist = True

[gh-actions]
python =
3.6: py36
3.7: py37
3.8: py38
3.9: py39
3.10: py310


[testenv]
Expand Down Expand Up @@ -66,7 +64,7 @@ whitelist_externals =
description = Update dependency lock files
# Force it to use oldest supported version of python or we would lose ability
# to get pinning correctly.
basepython = python3.6
basepython = python3.8
deps =
pip-tools >= 6.4.0
pre-commit >= 2.13.0
Expand Down

0 comments on commit e4ee990

Please sign in to comment.