From cd6ba01d518723c03239cf0f8078d13470536c03 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Mon, 15 Apr 2019 14:14:05 +0100 Subject: [PATCH] distribute universal wheels also avoid deprecated download_url property --- .travis.yml | 2 ++ Makefile | 2 +- setup.cfg | 2 ++ setup.py | 12 +++++++----- 4 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 setup.cfg diff --git a/.travis.yml b/.travis.yml index f3e5596..20d8196 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,10 @@ after_success: - make coveralls deploy: provider: pypi + distributions: "sdist bdist_wheel" user: "Ben.Timby" password: secure: "CwfEq0SYcw1CpNrdjMFD/R8rCZVWwTeDZQZj6Z4LIi2PUd++BdDcB9S/NVCjChxD4C9CrausH/iFoPnBYFyNf5c13BTxuo5oFC7PUY99a/PjHR8vjGC48lj5KGE4W5O2qQQkgKojcP6rD8e1YPmaO9miRKIT9DLRpIqnSW4p+jI=" on: tags: true + python: "3.7" diff --git a/Makefile b/Makefile index 84065a3..e02a84d 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ lint: flake8 radius.py dependencies: - pip install coverage coveralls flake8 + pip install coverage coveralls flake8 wheel travis: lint test diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..3c6e79c --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[bdist_wheel] +universal=1 diff --git a/setup.py b/setup.py index 0dde8aa..3af230a 100644 --- a/setup.py +++ b/setup.py @@ -1,14 +1,16 @@ #!/bin/env python -from distutils.core import setup +try: + from setuptools import setup +except ImportError: + from distutils.core import setup + import radius name = 'py-radius' version = radius.__version__ release = '1' versrel = version + '-' + release -download_url = 'https://github.com/downloads/btimby/' + name + \ - '/' + name + '-' + versrel + '.tar.gz' with open('LICENSE', 'r') as l: license = l.read() @@ -23,8 +25,7 @@ author_email = 'zen@shangri-la.dropbear.id.au', maintainer = 'Ben Timby', maintainer_email = 'btimby@gmail.com', - url = 'http://github.com/btimby/' + name + '/', - download_url = download_url, + url = 'https://github.com/btimby/' + name + '/', license = license, py_modules = ["radius"], classifiers = [ @@ -37,6 +38,7 @@ 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: System :: Systems Administration :: Authentication/Directory', ]