Avoid setup.cfg for now, since it seems to break pypi. Fixes #658

diff --git a/NEWS b/NEWS
index 406cdca2314c870a8d3beaa68eab0f804effa577..438a09c880f805ee055891a97c1a14b624077529 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,9 @@
   * Support paths as bytestrings in various places in ``dulwich.index``
     (Jelmer Vernooij)
 
+  * Avoid setup.cfg for now, since it seems to break pypi metadata.
+    (Jelmer Vernooij, #658)
+
 0.19.5 2018-07-08
 
  IMPROVEMENTS

diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644 (file)
index c54a90a..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-[metadata]
-name = dulwich
-# Avoid unicode characters, because setuptools doesn't
-# like them. See https://github.com/pypa/setuptools/issues/1062
-author = Jelmer Vernooij
-author_email = jelmer@jelmer.uk
-home-page = https://www.dulwich.io/
-description = file:README.md
-summary = Python Git Library
-classifiers =
-    Development Status :: 4 - Beta
-    License :: OSI Approved :: Apache Software License
-    Programming Language :: Python :: 2.7
-    Programming Language :: Python :: 3.3
-    Programming Language :: Python :: 3.4
-    Programming Language :: Python :: 3.5
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: Implementation :: CPython
-    Programming Language :: Python :: Implementation :: PyPy
-    Operating System :: POSIX
-    Operating System :: Microsoft :: Windows
-    Topic :: Software Development :: Version Control
-keyword = git, vcs
-project_urls =
-    Bug Tracker = https://github.com/dulwich/dulwich/issues
-
-[build_ext]

diff --git a/setup.py b/setup.py
index 400f6c4998d983e2380de1db6bbbae1697ea656c..ceac874b7a32ca5f1bb9cf54a881f31fd4a104b7 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -83,15 +83,42 @@ if has_setuptools:
     setup_kwargs['test_suite'] = 'dulwich.tests.test_suite'
     setup_kwargs['tests_require'] = tests_require
 
+with open('README.md', 'r') as f:
+    description = f.read()
 
 setup(name='dulwich',
+      author="Jelmer Vernooij",
+      author_email="jelmer@jelmer.uk",
+      url="https://www.dulwich.io/",
+      description=description,
+      summary="Python Git Library",
       version=dulwich_version_string,
       license='Apachev2 or later or GPLv2',
+      project_urls={
+          "Bug Tracker": "https://github.com/dulwich/dulwich/issues",
+          "Repository": "https://www.dulwich.io/code/",
+          "GitHub": "https://github.com/dulwich/dulwich",
+      },
+      keywords="git vcs",
       packages=['dulwich', 'dulwich.tests', 'dulwich.tests.compat',
                 'dulwich.contrib'],
       package_data={'': ['../docs/tutorial/*.txt']},
       scripts=['bin/dulwich', 'bin/dul-receive-pack', 'bin/dul-upload-pack'],
       ext_modules=ext_modules,
       distclass=DulwichDistribution,
+      classifiers=[
+          'Development Status :: 4 - Beta',
+          'License :: OSI Approved :: Apache Software License',
+          'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3.3',
+          'Programming Language :: Python :: 3.4',
+          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: Implementation :: CPython',
+          'Programming Language :: Python :: Implementation :: PyPy',
+          'Operating System :: POSIX',
+          'Operating System :: Microsoft :: Windows',
+          'Topic :: Software Development :: Version Control',
+      ],
       **setup_kwargs
       )