Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop python 3.6 #810

Merged
merged 1 commit into from
May 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/python-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python: [3.6, 3.7, 3.8, 3.9]
python: [3.7, 3.8, 3.9, "3.10"]

steps:
- uses: actions/checkout@v2
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ The format is based on the [KeepAChangeLog] project.

## Unreleased

### Changed
- [#810] Drop python 3.6 support

[#810]: https://github.com/OpenIDC/pyoidc/pull/810

## 1.3.0 [2021-07-09]

### Changed
Expand Down
18 changes: 9 additions & 9 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
image:
- Visual Studio 2019

environment:
matrix:
- PYTHON: "C:\\Python36-x64"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python37-x64"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python38-x64"
PYTHON_ARCH: "64"
- TOXENV: py37
- TOXENV: py38
- TOXENV: py39
- TOXENV: py310

build: off

install:
- "%PYTHON%\\python.exe -m pip install --upgrade pip"
- "%PYTHON%\\python.exe -m pip install .[testing]"
- py -m pip install --upgrade pip tox

test_script:
- "%PYTHON%\\python.exe -m pytest tests/"
- py -m tox
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ def run_tests(self):
classifiers=[
"Development Status :: 4 - Beta",
"License :: OSI Approved :: Apache Software License",
"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"],
python_requires='~=3.5',
extras_require={
Expand Down
3 changes: 0 additions & 3 deletions tests/utils/test_client_management_run.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import sys
import tempfile
from subprocess import PIPE
from subprocess import STDOUT
Expand All @@ -23,13 +22,11 @@ def db_file_path():


class TestClientManagementRun(object):
@pytest.mark.xfail(sys.version_info < (3, 6), reason="Deprecation in cryptography")
def test_help_prints_usage_instructions(self):
result = run(CLI_INVOCATION + "--help", shell=True, stdout=PIPE, stderr=PIPE)
assert result.stdout.decode().startswith("usage: ")
assert result.stderr.decode() == ""

@pytest.mark.xfail(sys.version_info < (3, 6), reason="Deprecation in cryptography")
def test_list_option_with_empty_db_lists_nothing(self, db_file_path):
for list_option_form in ("-l", "--list"):
result = run(
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{36,37,38},docs,quality
envlist = py{37,38,39,310},docs,quality
skip_missing_interpreters = True

[testenv]
Expand Down