Skip to content

Commit ff7e934

Browse files
KronoptKronopt
authored
Develop (#18)
* Update requirements.txt * Update requirements.txt * feat: deprecate python 3.5, support python 3.9 * Update requirements.txt * Update requirements.txt * chore: update pylint dev dependency * chore: update .gitignore * feat: support python 3.10 and 3.11 * fix: - minimum `requests` version for python 3.6 - ci/cd python-version matrix for version 3.10 * fix: github actions doesn't have pytthon 3.11 for testing yet Co-authored-by: Kronopt <Kronopt@users.noreply.github.com>
1 parent 616270e commit ff7e934

20 files changed

+225
-249
lines changed

‎.github/workflows/workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
max-parallel: 4
1111
matrix:
12-
python-version: [3.6, 3.7, 3.8, 3.9]
12+
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
1313
steps:
1414

1515
- uses: actions/checkout@v1

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ build/
55
dist/
66
xkcd_wrapper.egg-info/
77

8-
# Pycharm files
8+
# IDE files
99
.idea/
10+
.vscode/
1011

1112
# VirtualEnv
1213
venv/

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: help install-dependencies install-dependencies-dev test lint coverage docs-test build build-test release clean clean-pyc clean-coverage clean-build
1+
.PHONY: help install-dependencies install-dependencies-dev test lint coverage docs-test build build-test release clean-coverage clean-build clean-pyc clean
22

33
help:
44
@echo ""
@@ -31,6 +31,7 @@ test:
3131

3232
lint:
3333
python -m pylint xkcd_wrapper setup.py
34+
python -m black --check .
3435

3536
coverage:
3637
python -m coverage run --source xkcd_wrapper -m nose2 -s ./tests -t .

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# xkcd-wrapper
22
[![python versions](https://img.shields.io/pypi/pyversions/xkcd-wrapper "supported python versions")](https://pypi.org/project/xkcd-wrapper)
33
[![build status](https://github.com/Kronopt/xkcd-wrapper/workflows/CI/badge.svg "build status")](https://github.com/Kronopt/xkcd-wrapper/actions?query=workflow%3ACI)
4+
[![code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
45
[![coverage](https://codecov.io/gh/Kronopt/xkcd-wrapper/branch/master/graph/badge.svg "code coverage")](https://codecov.io/gh/Kronopt/xkcd-wrapper)
56
[![vulnerabilities](https://snyk.io/test/github/Kronopt/xkcd-wrapper/badge.svg?targetFile=requirements.txt)](https://snyk.io/test/github/Kronopt/xkcd-wrapper?targetFile=requirements.txt)
67
[![docs status](https://readthedocs.org/projects/xkcd-wrapper/badge/?version=latest "documentation build status")](https://xkcd-wrapper.readthedocs.io/en/latest/)

‎docs/history.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# History
22

3+
### 1.0.2 (01-11-2022)
4+
* Support Python 3.10
5+
* Update dependencies
6+
37
### 1.0.1 (28-02-2021)
48
* Deprecate Python 3.5
59
* Support Python 3.9

‎docs/index.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# xkcd-wrapper
22
[![python versions](https://img.shields.io/pypi/pyversions/xkcd-wrapper "supported python versions")](https://pypi.org/project/xkcd-wrapper)
33
[![build status](https://github.com/Kronopt/xkcd-wrapper/workflows/CI/badge.svg "build status")](https://github.com/Kronopt/xkcd-wrapper/actions?query=workflow%3ACI)
4+
[![code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
45
[![coverage](https://codecov.io/gh/Kronopt/xkcd-wrapper/branch/master/graph/badge.svg "code coverage")](https://codecov.io/gh/Kronopt/xkcd-wrapper)
6+
[![vulnerabilities](https://snyk.io/test/github/Kronopt/xkcd-wrapper/badge.svg?targetFile=requirements.txt)](https://snyk.io/test/github/Kronopt/xkcd-wrapper?targetFile=requirements.txt)
57
[![docs status](https://readthedocs.org/projects/xkcd-wrapper/badge/?version=latest "documentation build status")](https://xkcd-wrapper.readthedocs.io/en/latest/)
68
[![license](https://img.shields.io/pypi/l/xkcd-wrapper "license")](https://github.com/Kronopt/xkcd-wrapper/blob/master/LICENSE)
79

‎make.bat‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎requirements-dev.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ nose2==0.9.* # tests
22
requests-mock==1.7.* # tests, Client
33
aioresponses==0.7.* # tests, AsyncClient
44
pylint==2.7.* # style
5+
black # style
56
coverage==5.1.* # coverage
67
mkdocs==1.1.* # docs
78
twine # pypi tools

‎requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
aiohttp>=3.7.3,<3.8
2-
requests>=2.23.*,<2.25.*
1+
aiohttp~=3.8.0,>=3.8.3
2+
requests>=2.27.0,<2.29

‎setup.py‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
except ImportError:
1414
from distutils.core import setup
1515

16-
with open('README.md', encoding='utf-8') as readme_md,\
17-
open('docs/history.md', encoding='utf-8') as history_md,\
18-
open('requirements.txt', encoding='utf-8') as requirements_txt:
16+
with open("README.md", encoding="utf-8") as readme_md, open(
17+
"docs/history.md", encoding="utf-8"
18+
) as history_md, open("requirements.txt", encoding="utf-8") as requirements_txt:
1919
README = readme_md.read()
2020
HISTORY = history_md.read()
2121

2222
REQUIREMENTS = []
2323
REQUIREMENTS_EXTRA = {}
2424
for req in requirements_txt.readlines():
25-
req = req[:req.find('#')].rstrip() # remove comments
25+
req = req[: req.find("#")].rstrip() # remove comments
2626
if req.startswith("requests"):
2727
REQUIREMENTS_EXTRA["requests"] = req
2828
elif req.startswith("aiohttp"):
@@ -31,34 +31,35 @@
3131
REQUIREMENTS.append(req)
3232

3333
setup(
34-
name='xkcd-wrapper',
34+
name="xkcd-wrapper",
3535
version=xkcd_wrapper.__version__,
36-
description='A wrapper for the xkcd API',
37-
long_description=README + '\n\n' + HISTORY,
38-
long_description_content_type='text/markdown',
36+
description="A wrapper for the xkcd API",
37+
long_description=README + "\n\n" + HISTORY,
38+
long_description_content_type="text/markdown",
3939
license=xkcd_wrapper.__license__,
4040
author=xkcd_wrapper.__author__,
41-
url='https://github.com/Kronopt/xkcd-wrapper',
42-
project_urls={'Documentation': 'https://xkcd-wrapper.readthedocs.io/en/latest/'},
43-
packages=['xkcd_wrapper'],
44-
package_dir={'xkcd_wrapper': 'xkcd_wrapper'},
41+
url="https://github.com/Kronopt/xkcd-wrapper",
42+
project_urls={"Documentation": "https://xkcd-wrapper.readthedocs.io/en/latest/"},
43+
packages=["xkcd_wrapper"],
44+
package_dir={"xkcd_wrapper": "xkcd_wrapper"},
4545
include_package_data=True,
4646
install_requires=REQUIREMENTS,
4747
extras_require={
48-
"sync": [REQUIREMENTS_EXTRA["requests"]],
48+
"sync": [REQUIREMENTS_EXTRA["requests"]],
4949
"async": [REQUIREMENTS_EXTRA["aiohttp"]],
5050
},
5151
zip_safe=False,
52-
keywords='xkcd wrapper xkcd-wrapper',
52+
keywords="xkcd wrapper xkcd-wrapper",
5353
classifiers=[
54-
'Development Status :: 5 - Production/Stable',
55-
'Intended Audience :: Developers',
56-
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
57-
'Natural Language :: English',
58-
'Programming Language :: Python :: 3',
59-
'Programming Language :: Python :: 3.6',
60-
'Programming Language :: Python :: 3.7',
61-
'Programming Language :: Python :: 3.8',
62-
'Programming Language :: Python :: 3.9',
54+
"Development Status :: 5 - Production/Stable",
55+
"Intended Audience :: Developers",
56+
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
57+
"Natural Language :: English",
58+
"Programming Language :: Python :: 3",
59+
"Programming Language :: Python :: 3.6",
60+
"Programming Language :: Python :: 3.7",
61+
"Programming Language :: Python :: 3.8",
62+
"Programming Language :: Python :: 3.9",
63+
"Programming Language :: Python :: 3.10",
6364
],
6465
)

0 commit comments

Comments
 (0)