From f1fb85a74493987509389cdf7b876cd1bc2d6f6a Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Mon, 28 Oct 2019 17:09:56 +0100 Subject: [PATCH] Replace pbr with plain setuptools --- .gitignore | 2 -- setup.cfg | 36 ++++++++++++++++++++++++------------ setup.py | 4 +--- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 92799f33e..9f407d15e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,6 @@ /.coverage /.eggs /.tox -/AUTHORS -/ChangeLog /Comics /build /dist diff --git a/setup.cfg b/setup.cfg index 3100560ea..66f97ace0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,14 +1,16 @@ [metadata] name = dosage maintainer = Tobias Gruetzmacher -maintainer-email = tobias-dosage@23.gs -summary = a comic strip downloader and archiver -description-file = README.md -home-page = http://dosage.rocks/ -license = MIT -platform = Any +maintainer_email = tobias-dosage@23.gs +description = a comic strip downloader and archiver +long_description = file: README.md +long_description_content_type = text/markdown +url = https://github.com/webcomics/dosage +license = MIT License +license_file = COPYING +platforms = Any keywords = comic,webcomic,downloader,archiver,crawler -classifier = +classifiers = Environment :: Console Intended Audience :: End Users/Desktop Topic :: Multimedia :: Graphics @@ -25,15 +27,25 @@ classifier = Programming Language :: Python :: 3.8 Operating System :: OS Independent -[files] -packages = - dosagelib +[options] +setup_requires = + setuptools >= 36.7.0 + setuptools_scm +python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.* +packages = find: +install_requires = + colorama + lxml + requests>=2.0 + six + backports.shutil_get_terminal_size; python_version<'3.3' + backports.functools_lru_cache; python_version<'3.2' -[entry_points] +[options.entry_points] console_scripts = dosage = dosagelib.cmd:main -[extras] +[options.extras_require] css = cssselect dimensions = diff --git a/setup.py b/setup.py index 6dceb38cd..7739e7dc2 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,5 @@ from __future__ import absolute_import, division, print_function from setuptools import setup setup( - setup_requires=['pbr>=1.9', 'setuptools>=17.1'], - python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', - pbr=True, + use_scm_version=True, )