From f3f3f3e2043b322a2a837d273eef73a3e87bc10e Mon Sep 17 00:00:00 2001
From: Ales Erjavec <ales.erjavec@fri.uni-lj.si>
Date: Thu, 9 Sep 2021 15:20:30 +0200
Subject: [PATCH] setup.cfg: Move metadata to setup.cfg, raise version

---
 setup.cfg | 55 +++++++++++++++++++++++++++++++++++++-
 setup.py  | 80 +++----------------------------------------------------
 2 files changed, 57 insertions(+), 78 deletions(-)
 mode change 100755 => 100644 setup.py

diff --git a/setup.cfg b/setup.cfg
index 0573a530d..a95fb4b47 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,58 @@
 [metadata]
-license_file=LICENSE.txt
+
+name             = orange-canvas-core
+version          = 0.2.0a1.dev0
+description      = Core component of Orange Canvas
+long_description = file: README.rst
+keywords         =
+home_page        = http://orange.biolab.si/
+author           = Bioinformatics Laboratory, FRI UL <contact@orange.biolab.si>
+
+project_urls =
+    Home Page     = https://github.com/biolab/orange-canvas-core
+    Source        = https://github.com/biolab/orange-canvas-core
+    Issue Tracker = https://github.com/biolab/orange-canvas-core/issues
+    Documentation = https://orange-canvas-core.readthedocs.io/en/latest/
+
+license = GPLv3
+license_file = LICENSE.txt
+
+classifiers =
+    Development Status :: 1 - Planning
+    Environment :: X11 Applications :: Qt
+    Programming Language :: Python :: 3
+    License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+    Operating System :: OS Independent
+    Topic :: Scientific/Engineering :: Visualization
+    Topic :: Software Development :: Libraries :: Python Modules
+    Intended Audience :: Education
+    Intended Audience :: Developers
+
+[options]
+
+packages = find:
+
+install_requires =
+    setuptools
+    AnyQt >= 0.1.0
+    docutils
+    commonmark >= 0.8.1
+    requests
+    cachecontrol[filecache]
+    pip >= 20.0
+    dictdiffer
+    qasync >= 0.13.0
+    importlib_metadata; python_version<'3.8'
+    dataclasses; python_version<'3.7'
+
+setup_requires=
+    setuptools >=30.0
+
+python_requires = >=3.6
+
+[options.extras_require]
+DOCBUILD = sphinx; sphinx-rtd-theme;
+
 
 [coverage:run]
 source =
diff --git a/setup.py b/setup.py
old mode 100755
new mode 100644
index 47a668ae1..61778d103
--- a/setup.py
+++ b/setup.py
@@ -1,80 +1,6 @@
 #! /usr/bin/env python
-from setuptools import setup, find_packages
-
-NAME = "orange-canvas-core"
-VERSION = "0.1.27.dev0"
-DESCRIPTION = "Core component of Orange Canvas"
-
-with open("README.rst", "rt", encoding="utf-8") as f:
-    LONG_DESCRIPTION = f.read()
-
-URL = "http://orange.biolab.si/"
-AUTHOR = "Bioinformatics Laboratory, FRI UL"
-AUTHOR_EMAIL = 'contact@orange.biolab.si'
-
-LICENSE = "GPLv3"
-DOWNLOAD_URL = 'https://github.com/biolab/orange-canvas-core'
-PACKAGES = find_packages()
-
-PACKAGE_DATA = {
-    "orangecanvas": ["icons/*.svg", "icons/*png"],
-    "orangecanvas.styles": ["*.qss", "orange/*.svg"],
-}
-
-INSTALL_REQUIRES = (
-    "setuptools",
-    "AnyQt>=0.1.0",
-    "docutils",
-    "commonmark>=0.8.1",
-    "requests",
-    "cachecontrol[filecache]",
-    "pip>=18.0",
-    "dictdiffer",
-    "qasync",
-    "importlib_metadata; python_version<'3.8'",
-    "dataclasses; python_version<'3.7'",
-)
-
-
-CLASSIFIERS = (
-    "Development Status :: 1 - Planning",
-    "Environment :: X11 Applications :: Qt",
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-    "Operating System :: OS Independent",
-    "Topic :: Scientific/Engineering :: Visualization",
-    "Topic :: Software Development :: Libraries :: Python Modules",
-    "Intended Audience :: Education",
-    "Intended Audience :: Developers",
-)
-
-EXTRAS_REQUIRE = {
-    'DOCBUILD': ['sphinx', 'sphinx-rtd-theme'],
-}
-
-PROJECT_URLS = {
-    "Bug Reports": "https://github.com/biolab/orange-canvas-core/issues",
-    "Source": "https://github.com/biolab/orange-canvas-core/",
-    "Documentation": "https://orange-canvas-core.readthedocs.io/en/latest/",
-}
-
-PYTHON_REQUIRES = ">=3.6"
+from setuptools import setup
 
 if __name__ == "__main__":
-    setup(
-        name=NAME,
-        version=VERSION,
-        description=DESCRIPTION,
-        long_description=LONG_DESCRIPTION,
-        long_description_content_type="text/x-rst",
-        url=URL,
-        author=AUTHOR,
-        author_email=AUTHOR_EMAIL,
-        license=LICENSE,
-        packages=PACKAGES,
-        package_data=PACKAGE_DATA,
-        install_requires=INSTALL_REQUIRES,
-        extras_require=EXTRAS_REQUIRE,
-        project_urls=PROJECT_URLS,
-        python_requires=PYTHON_REQUIRES,
-    )
+    # setup.cfg has authoritative package descriptions
+    setup()