diff --git a/CHANGES.txt b/CHANGES.txt index 89b7f467..7b21640a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,10 @@ +.. _2.0.12: + +2.0.12 (unreleased) +------------------ + + + .. _2.0.11: 2.0.11 (2020-08-21) diff --git a/setup.py b/setup.py index aa9e0a4b..be1ae8d8 100644 --- a/setup.py +++ b/setup.py @@ -12,23 +12,18 @@ # ############################################################################## -# Standard Library -import os - from setuptools import find_packages from setuptools import setup -here = os.path.abspath(os.path.dirname(__file__)) +def readfile(name): + with open(name) as f: + return f.read() + -try: - with open(os.path.join(here, "README.rst")) as f: - README = f.read() - with open(os.path.join(here, "CHANGES.txt")) as f: - CHANGES = f.read() -except Exception: - README = "" - CHANGES = "" +README = readfile("README.rst") +CHANGES = readfile("CHANGES.txt") +VERSION = '2.0.12.dev0' requires = [ "Chameleon>=2.5.1", # Markup class @@ -39,7 +34,6 @@ "zope.deprecation", ] - lint_extras = [ "black", "check-manifest", @@ -50,7 +44,7 @@ "readme_renderer", ] -testing_extras = ["beautifulsoup4", "coverage", "flaky", "nose"] +testing_extras = ["coverage", "flaky", "nose"] # Needed to run deformdemo tests functional_testing_extras = [ @@ -68,9 +62,15 @@ "pylons-sphinx-themes", ] -setupkw = dict( +branch_version = ".".join(VERSION.split(".")[:2]) + +# black is refusing to make anything under 80 chars so just splitting it up +docs_fmt = "https://docs.pylonsproject.org/projects/deform/en/{}-branch/" +docs_url = docs_fmt.format(branch_version) + +setup( name="deform", - version="2.0.12.dev", + version=VERSION, description="Form library with advanced features like nested forms", long_description=README + "\n\n" + CHANGES, classifiers=[ @@ -90,6 +90,11 @@ author="Chris McDonough, Agendaless Consulting", author_email="pylons-discuss@googlegroups.com", url="https://docs.pylonsproject.org/projects/deform/en/latest/", + project_urls={ + 'Documentation': docs_url, + 'Changelog': '{}whatsnew-{}.html'.format(docs_url, branch_version), + 'Issue Tracker': 'https://github.com/Pylons/deform/issues', + }, license="BSD-derived (http://www.repoze.org/LICENSE.txt)", packages=find_packages(), include_package_data=True, @@ -110,5 +115,3 @@ ), }, ) - -setup(**setupkw) diff --git a/tox.ini b/tox.ini index d1ccde3a..1cbc2916 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = lint,docs, - py27,py34,py35,py36,py37,py38,pypy,pypy3, + py27,py35,py36,py37,py38,pypy,pypy3, {py2,py3}-cover,coverage, functional, functional3 @@ -10,7 +10,6 @@ envlist = # to defaults for others. basepython = py27: python2.7 - py34: python3.4 py35: python3.5 py36: python3.6 py37: python3.7