From 744e128e3575a60fd3dcd7c25d334f4506f4e04b Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Sun, 11 Dec 2022 20:56:07 +0100 Subject: [PATCH 1/3] Remove unused requirements.txt --- requirements.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 98a0c056a..000000000 --- a/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -appdirs -colorama -imagesize -lxml>=4.0.0 -requests>=2.0 -cached_property; python_version<'3.8' -importlib_metadata; python_version<'3.8' From d7ac11cb6b9d1a4d060e4b5da6e94baf02c0a7ac Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Sun, 11 Dec 2022 21:30:10 +0100 Subject: [PATCH 2/3] Migrate setuptools config to pyproject.toml --- pyproject.toml | 87 +++++++++++++++++++++++++++++++++++++++++++++++++- setup.cfg | 81 ---------------------------------------------- 2 files changed, 86 insertions(+), 82 deletions(-) delete mode 100644 setup.cfg diff --git a/pyproject.toml b/pyproject.toml index 9987e4338..5cac5d3ed 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,92 @@ [build-system] -requires = ["setuptools>=45", "wheel", "setuptools_scm>=6.2"] +requires = ["setuptools>=61.2", "setuptools_scm>=6.2"] build-backend = "setuptools.build_meta" +[project] +name = "dosage" +description = "a comic strip downloader and archiver" +readme = "README.md" +maintainers = [{name = "Tobias Gruetzmacher", email = "tobias-dosage@23.gs"}] +license = {text = "MIT License"} +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Environment :: Console", + "Intended Audience :: End Users/Desktop", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Topic :: Internet :: WWW/HTTP", + "Topic :: Multimedia :: Graphics", +] +keywords = ["comic", "webcomic", "downloader", "archiver", "crawler"] +requires-python = ">=3.7" +dependencies = [ + "colorama", + "imagesize", + "lxml>=4.0.0", + "platformdirs", + "requests>=2.0", + "cached_property;python_version<'3.8'", + "importlib_metadata;python_version<'3.8'", +] +dynamic = ["version"] + +[project.urls] +Homepage = "https://dosage.rocks" +Code = "https://github.com/webcomics/dosage" +"Issue tracker" = "https://github.com/webcomics/dosage/issues" + +[project.optional-dependencies] +bash = ["argcomplete"] +css = ["cssselect"] +dev = [ + "allure-pytest", + "pytest-cov", + "pytest-xdist", + "responses", + "setup-cfg-fmt", +] +lint = [ + "flake8<6", + "flake8-2020", + "flake8-breakpoint", + "flake8-bugbear", + "flake8-coding", + "flake8-commas", + "flake8-comprehensions", + "flake8-eradicate", + "flake8-fixme", + "flake8-functions", + "flake8-future-import", + "flake8-logging-format", + "flake8-noqa", + "Flake8-pyproject", + "flake8-pytest", + "flake8-pytest-style", +] + +[project.scripts] +dosage = "dosagelib.cmd:main" + +[project.entry-points.pyinstaller40] +hook-dirs = "dosagelib.__pyinstaller:get_hook_dirs" + +[tool.setuptools] +platforms = ["Any"] +license-files = ["COPYING"] + +[tool.setuptools.packages] +find = {namespaces = false} + +[tool.distutils.bdist_wheel] +universal = true + [tool.setuptools_scm] [tool.flake8] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 7d82af84f..000000000 --- a/setup.cfg +++ /dev/null @@ -1,81 +0,0 @@ -[metadata] -name = dosage -description = a comic strip downloader and archiver -long_description = file: README.md -long_description_content_type = text/markdown -url = https://dosage.rocks -maintainer = Tobias Gruetzmacher -maintainer_email = tobias-dosage@23.gs -license = MIT License -license_file = COPYING -platforms = Any -classifiers = - Development Status :: 5 - Production/Stable - Environment :: Console - Intended Audience :: End Users/Desktop - License :: OSI Approved :: MIT License - Operating System :: OS Independent - Programming Language :: Python - Programming Language :: Python :: 3 - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Topic :: Internet :: WWW/HTTP - Topic :: Multimedia :: Graphics -keywords = comic,webcomic,downloader,archiver,crawler -project_urls = - Code = https://github.com/webcomics/dosage - Issue tracker = https://github.com/webcomics/dosage/issues - -[options] -packages = find: -install_requires = - colorama - imagesize - lxml>=4.0.0 - platformdirs - requests>=2.0 - cached_property;python_version<'3.8' - importlib_metadata;python_version<'3.8' -include_package_data = true -python_requires = >=3.7 - -[options.entry_points] -console_scripts = - dosage = dosagelib.cmd:main -pyinstaller40 = - hook-dirs = dosagelib.__pyinstaller:get_hook_dirs - -[options.extras_require] -bash = - argcomplete -css = - cssselect -dev = - allure-pytest - pytest-cov - pytest-xdist - responses - setup-cfg-fmt -lint = - flake8<6 - flake8-2020 - flake8-breakpoint - flake8-bugbear - flake8-coding - flake8-commas - flake8-comprehensions - flake8-eradicate - flake8-fixme - flake8-functions - flake8-future-import - flake8-logging-format - flake8-noqa - Flake8-pyproject - flake8-pytest - flake8-pytest-style - -[bdist_wheel] -universal = 1 From b40cde7fc84c736a00cd74f9d2646a12a8f02a53 Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Sun, 11 Dec 2022 21:30:33 +0100 Subject: [PATCH 3/3] Loose the dot in pytest's name --- tests/modules/testall.sh | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/modules/testall.sh b/tests/modules/testall.sh index e6d111672..cf5ab2d03 100755 --- a/tests/modules/testall.sh +++ b/tests/modules/testall.sh @@ -12,7 +12,7 @@ cd /work pip install --no-warn-script-location --user pytest-cov PySocks pip install --no-warn-script-location --user -e '.[css,dev]' -TESTALL=1 python3 -m py.test -v --cov=. --cov-report xml \ +TESTALL=1 python3 -m pytest -v --cov=. --cov-report xml \ --alluredir=allure-data \ --tb=short -n10 --junitxml=junit.xml \ tests/modules/check_comics.py || true diff --git a/tox.ini b/tox.ini index 4e6acd7af..a79576852 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ python = [testenv] commands = - {envbindir}/py.test --tb=short \ + {envbindir}/pytest --tb=short \ --junitxml={toxworkdir}/reports/{envname}/junit.xml \ --alluredir={toxworkdir}/reports/{envname}/allure-data \ --cov={envsitepackagesdir}/dosagelib \