update project metadata

.azure-pipelines.yml

@@ -1,35 +1,35 @@
 trigger:
   - master
-  - "*.x"
+  - '*.x'
 
 variables:
   vmImage: ubuntu-latest
-  python.version: "3.7"
-  TOXENV: py,coverage-ci
-  hasTestResults: true
+  python.version: '3.8'
+  TOXENV: py
 
 strategy:
   matrix:
-    Python 3.7 Linux:
+    Python 3.8 Linux:
       vmImage: ubuntu-latest
-    Python 3.7 Windows:
+    Python 3.8 Windows:
       vmImage: windows-latest
-    Python 3.7 Mac:
+    Python 3.8 Mac:
       vmImage: macos-latest
     PyPy 3 Linux:
       python.version: pypy3
+    Python 3.7 Linux:
+      python.version: '3.7'
     Python 3.6 Linux:
-      python.version: 3.6
+      python.version: '3.6'
     Python 3.5 Linux:
-      python.version: 3.5
+      python.version: '3.5'
     Python 2.7 Linux:
-      python.version: 2.7
+      python.version: '2.7'
     Python 2.7 Windows:
-      python.version: 2.7
       vmImage: windows-latest
+      python.version: '2.7'
     Docs:
       TOXENV: docs
-      hasTestResults: false
 
 pool:
   vmImage: $(vmImage)

.gitignore

@@ -1,18 +1,15 @@
-*.pyc
-*.pyo
+/.idea/
+/.vscode/
+/env/
+/venv/
 __pycache__/
-.idea/
-.ropeproject
-.DS_Store
-env/
-venv/
+*.pyc
 *.egg-info/
-*.eggs/
-build/
-dist/
-docs/_build/
-.pytest_cache/
-.tox/
+/build/
+/dist/
+/.pytest_cache/
+/.tox/
 .coverage
 .coverage.*
-htmlcov/
+/htmlcov/
+/docs/_build/

LICENSE.rst

@@ -1,39 +1,28 @@
-Copyright © 2014 by the Pallets team.
+Copyright 2014 Pallets
 
-Some rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-Redistribution and use in source and binary forms of the software as
-well as documentation, with or without modification, are permitted
-provided that the following conditions are met:
-
--   Redistributions of source code must retain the above copyright
+1.  Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
--   Redistributions in binary form must reproduce the above copyright
+2.  Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
 
--   Neither the name of the copyright holder nor the names of its
+3.  Neither the name of the copyright holder nor the names of its
     contributors may be used to endorse or promote products derived from
     this software without specific prior written permission.
 
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-----
-
-Click uses parts of optparse written by Gregory P. Ward and maintained
-by the Python Software Foundation. This is limited to code in parser.py.
-
-Copyright © 2001-2006 Gregory P. Ward. All rights reserved.
-Copyright © 2002-2006 Python Software Foundation. All rights reserved.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

MANIFEST.in

@@ -1,11 +1,8 @@
 include CHANGES.rst
-include CONTRIBUTING.rst
-include LICENSE.rst
-include README.rst
 include tox.ini
 graft artwork
 graft docs
 prune docs/_build
 graft examples
 graft tests
-global-exclude *.py[co] .DS_Store
+global-exclude *.pyc

README.rst

@@ -24,18 +24,14 @@ Install and update using `pip`_:
 
 .. code-block:: text
 
-    $ pip install click
-
-Click supports Python 3.4 and newer, Python 2.7, and PyPy.
+    $ pip install -U click
 
 .. _pip: https://pip.pypa.io/en/stable/quickstart/
 
 
 A Simple Example
 ----------------
 
-What does it look like? Here is an example of a simple Click program:
-
 .. code-block:: python
 
     import click
@@ -52,8 +48,6 @@ What does it look like? Here is an example of a simple Click program:
     if __name__ == '__main__':
         hello()
 
-And what it looks like when run:
-
 .. code-block:: text
 
     $ python hello.py --count=3
@@ -77,11 +71,10 @@ donate today`_.
 Links
 -----
 
-*   Website: https://palletsprojects.com/p/click/
-*   Documentation: https://click.palletsprojects.com/
-*   License: `BSD <https://github.com/pallets/click/blob/master/LICENSE.rst>`_
-*   Releases: https://pypi.org/project/click/
-*   Code: https://github.com/pallets/click
-*   Issue tracker: https://github.com/pallets/click/issues
-*   Test status: https://dev.azure.com/pallets/click/_build
-*   Official chat: https://discord.gg/t6rrQZH
+-   Website: https://palletsprojects.com/p/click/
+-   Documentation: https://click.palletsprojects.com/
+-   Releases: https://pypi.org/project/click/
+-   Code: https://github.com/pallets/click
+-   Issue tracker: https://github.com/pallets/click/issues
+-   Test status: https://dev.azure.com/pallets/click/_build
+-   Official chat: https://discord.gg/t6rrQZH

click/__init__.py

@@ -1,15 +1,9 @@
 # -*- coding: utf-8 -*-
 """
-click
-~~~~~
-
 Click is a simple Python module inspired by the stdlib optparse to make
 writing command line scripts fun. Unlike other modules, it's based
 around a simple API that does not come with too much magic and is
 composable.
-
-:copyright: © 2014 by the Pallets team.
-:license: BSD, see LICENSE.rst for more details.
 """
 
 # Core classes

click/_termui_impl.py

@@ -1,14 +1,8 @@
 # -*- coding: utf-8 -*-
 """
-click._termui_impl
-~~~~~~~~~~~~~~~~~~
-
 This module contains implementations for the termui module. To keep the
 import time of Click down, some infrequently used functionality is
 placed in this module and only imported as needed.
-
-:copyright: © 2014 by the Pallets team.
-:license: BSD, see LICENSE.rst for more details.
 """
 
 import os

click/parser.py

@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 """
-click.parser
-~~~~~~~~~~~~
-
 This module started out as largely a copy paste from the stdlib's
 optparse module with the features removed that we do not need from
 optparse because we implement them in Click on a higher level (for
@@ -14,6 +11,12 @@
 is that there are differences in 2.x and 3.x about the error messages
 generated and optparse in the stdlib uses gettext for no good reason
 and might cause us issues.
+
+Click uses parts of optparse written by Gregory P. Ward and maintained
+by the Python Software Foundation. This is limited to code in parser.py.
+
+Copyright 2001-2006 Gregory P. Ward. All rights reserved.
+Copyright 2002-2006 Python Software Foundation. All rights reserved.
 """
 
 import re

docs/changelog.rst

@@ -1,4 +1,4 @@
-Changelog
-=========
+Changes
+=======
 
 .. include:: ../CHANGES.rst

docs/license.rst

@@ -1,14 +1,4 @@
-License
-=======
-
-Click is licensed under a three-clause BSD License.  It basically means:
-do whatever you want with it as long as the copyright in Click sticks
-around, the conditions are not modified and the disclaimer is present.
-Furthermore, you must not use the names of the authors to promote derivatives
-of the software without written consent.
-
-License Text
-------------
+BSD-3-Clause License
+====================
 
 .. include:: ../LICENSE.rst
-

setup.cfg

@@ -6,6 +6,8 @@ universal = 1
 
 [tool:pytest]
 testpaths = tests
+filterwarnings =
+    error
 
 [coverage:run]
 branch = True
@@ -16,5 +18,4 @@ source =
 [coverage:paths]
 source =
     click
-    .tox/*/lib/python*/site-packages/click
-    .tox/pypy/site-packages/click
+    */site-packages

setup.py

@@ -6,7 +6,7 @@
     readme = f.read()
 
 with io.open("click/__init__.py", "rt", encoding="utf8") as f:
-    version = re.search(r"__version__ = \'(.*?)\'", f.read()).group(1)
+    version = re.search(r"__version__ = '(.*?)'", f.read()).group(1)
 
 setup(
     name="click",
@@ -17,28 +17,21 @@
         "Code": "https://github.com/pallets/click",
         "Issue tracker": "https://github.com/pallets/click/issues",
     },
-    license="BSD",
-    author="Armin Ronacher",
-    author_email="armin.ronacher@active-4.com",
-    maintainer="Pallets Team",
+    license="BSD-3-Clause",
+    maintainer="Pallets",
     maintainer_email="contact@palletsprojects.com",
     description="Composable command line interface toolkit",
     long_description=readme,
     packages=["click"],
     include_package_data=True,
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
     ],
 )

tox.ini

@@ -1,32 +1,15 @@
 [tox]
 envlist =
-    py{37,36,35,27,py3,py}
+    py{38,37,36,35,27,py3,py}
     docs
-    coverage
 skip_missing_interpreters = true
 
 [testenv]
 deps =
     pytest
-    coverage
     colorama
-commands = coverage run -p -m pytest --tb=short -Werror --basetemp={envtmpdir} {posargs}
+commands = pytest --tb=short --basetemp={envtmpdir} {posargs}
 
 [testenv:docs]
 deps = -r docs/requirements.txt
 commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html
-
-[testenv:coverage]
-deps = coverage
-skip_install = true
-commands =
-    coverage combine
-    coverage html
-    coverage report
-
-[testenv:coverage-ci]
-deps = codecov
-skip_install = true
-commands =
-    coverage combine
-    coverage xml