Skip to content

Commit

Permalink
Add support for Python 3.10 and drop EOL 3.5 (#167)
Browse files Browse the repository at this point in the history
* Add support for Python 3.10

* Remove Trove classifiers for dropped versions

* Remove redundant setup.cfg: no need for universal wheels for Python 3-only, setuptools and wheel auto-find LICENSE files

* Added Required Python Version

Added python_requires to specify the required python version for the library.

* Updated required python version

* Drop support for EOL Python 3.5

* Upgrade Python syntax with pyupgrade --py36-plus

Co-authored-by: Nirjas Jakilim <Nirzak@users.noreply.github.com>
  • Loading branch information
hugovk and Nirzak authored May 19, 2022
1 parent e713282 commit 04b7480
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]

steps:
- uses: actions/checkout@v2
Expand All @@ -33,7 +33,7 @@ jobs:
- name: Install test dependencies
run: |
python -m pip install --upgrade pip
pip install pytest
python -m pip install pytest
- name: Test with pytest
run: |
pytest
4 changes: 1 addition & 3 deletions certifi/core.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
certifi.py
~~~~~~~~~~
Expand Down Expand Up @@ -55,7 +53,7 @@ def read_text(
encoding: str = 'utf-8',
errors: str = 'strict'
) -> str:
with open(where(), "r", encoding=encoding) as data:
with open(where(), encoding=encoding) as data:
return data.read()

# If we don't have importlib.resources, then we will just do the old logic
Expand Down
2 changes: 0 additions & 2 deletions certifi/tests/test_certify.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

import os
import unittest

Expand Down
2 changes: 0 additions & 2 deletions setup.cfg

This file was deleted.

8 changes: 3 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from __future__ import with_statement
import re
import os
import sys
Expand All @@ -18,7 +16,7 @@


version_regex = r'__version__ = ["\']([^"\']*)["\']'
with open('certifi/__init__.py', 'r') as f:
with open('certifi/__init__.py') as f:
text = f.read()
match = re.search(version_regex, text)

Expand Down Expand Up @@ -48,19 +46,19 @@
include_package_data=True,
zip_safe=False,
license='MPL-2.0',
python_requires=">=3.5",
python_requires=">=3.6",
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
'Natural Language :: English',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'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',
],
project_urls={
'Source': 'https://github.com/certifi/python-certifi',
Expand Down

0 comments on commit 04b7480

Please sign in to comment.