Merge 0344009 into df795af

.travis.yml

@@ -1,13 +1,14 @@
 dist: xenial
 language: python
-arch: 
+arch:
     - amd64
     - ppc64le
 python:
     - "3.5"
     - "3.6"
     - "3.7"
     - "3.8"
+    - "3.9"
     - "pypy3.5-7.0.0"
     - "pypy3.6-7.1.1"
 jobs:
@@ -17,11 +18,11 @@ jobs:
       - arch: ppc64le
         python: pypy3.6-7.1.1
 install:
-    - pip install -r test-requirements.txt
+    - pip install '.[tests]'
 script:
-    # Only run mypy in "3.5" job, because installing it fails in PyPy jobs
+    # Only run mypy in "3.9" job, because installing it fails in PyPy jobs
     - |
-      if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then
+      if [[ $TRAVIS_PYTHON_VERSION == '3.9' ]]; then
         pip install mypy &&
         mypy .
       fi

setup.cfg

@@ -1,7 +1,45 @@
+[metadata]
+name = base58
+author = David Keijser
+author_email = keijser@gmail.com
+version = 2.0.1
+description = Base58 and Base58Check implementation.
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/keis/base58
+license = MIT
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    License :: OSI Approved :: MIT License
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+
+[options]
+packages = base58
+zip_safe = False
+python_requires = >=3.5
+
+[options.entry_points]
+console_scripts =
+    base58 = base58.__main__:main
+
+[options.package_data]
+base58 = py.typed
+
+[options.extras_require]
+tests =
+    pytest>=4.6
+    pytest-flake8
+    pytest-cov
+    PyHamcrest>=2.0.2
+    coveralls
+    pytest-benchmark
+
 [bumpversion]
 current_version = 2.0.1
 
-[bumpversion:file:setup.py]
+[bumpversion:file:setup.cfg]
 
 [bumpversion:file:base58/__init__.py]
 

setup.py

@@ -1,28 +1,3 @@
 from setuptools import setup
 
-setup(
-    name='base58',
-    packages=['base58'],
-    package_data={'base58': ['py.typed']},
-    version='2.0.1',
-    description='Base58 and Base58Check implementation',
-    author='David Keijser',
-    author_email='keijser@gmail.com',
-    url='https://github.com/keis/base58',
-    license='MIT',
-    zip_safe=False,  # mypy needs this to be able to find the package
-    entry_points={
-        'console_scripts': [
-            'base58 = base58.__main__:main'
-        ]
-    },
-    python_requires=">=3.5",
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'Natural Language :: English',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-    ],
-)
+setup()