Prepare to release 2.0.0

Update release notes and version string

.pre-commit-config.yaml

@@ -29,6 +29,10 @@ repos:
     additional_dependencies:
     - flake8-docstrings
     - flake8-import-order
+- repo: https://github.com/asottile/setup-cfg-fmt
+  rev: v1.19.0
+  hooks:
+  - id: setup-cfg-fmt
 #- repo: https://github.com/pre-commit/mirrors-mypy
 #  rev: v0.910-1
 #  hooks:

docs/source/release-notes/2.0.0.rst

@@ -0,0 +1,13 @@
+2.0.0 - 2022-01-10
+------------------
+
+- Drop support for Python 2.7, 3.3, 3.4, 3.5, 3.6
+
+- Add support for Python 3.8, 3.9, 3.10
+
+- Fix bug in resolving URIs that only contain schemes which are valid per the
+  RFC - `bug 81`_
+
+.. links below here
+.. _bug 81:
+   https://github.com/python-hyper/rfc3986/issues/81

docs/source/release-notes/index.rst

@@ -5,12 +5,19 @@
 All of the release notes that have been recorded for |rfc3986| are organized
 here with the newest releases first.
 
-1.x Release Series
+2.x Release Series
 ==================
 
 .. toctree::
 
     unreleased
+    2.0.0
+
+1.x Release Series
+==================
+
+.. toctree::
+
     1.5.0
     1.4.0
     1.3.2

docs/source/release-notes/unreleased.rst

@@ -1,13 +1,6 @@
-2.0.0 - 202z-aa-bb
+2.x.y - 202z-aa-bb
 ------------------
 
-- Drop support for Python 2.7, 3.3, 3.4, 3.5, 3.6
-
-- Add support for Python 3.8, 3.9, 3.10
-
-- Fix bug in resolving URIs that only contain schemes which are valid per the
-  RFC - `bug 81`_
+- *Add Items here*
 
 .. links below here
-.. _bug 81:
-   https://github.com/python-hyper/rfc3986/issues/81

setup.cfg

@@ -3,31 +3,38 @@ name = rfc3986
 version = attr: rfc3986.__version__
 description = Validating URI References per RFC 3986
 long_description = file: README.rst
+long_description_content_type = text/x-rst
+url = http://rfc3986.readthedocs.io
 author = Ian Stapleton Cordasco
 author_email = graffatcolmingov@gmail.com
-url = http://rfc3986.readthedocs.io
 license = Apache 2.0
+license_file = LICENSE
 classifiers =
     Development Status :: 5 - Production/Stable
     Intended Audience :: Developers
-    Natural Language :: English
     License :: OSI Approved :: Apache Software License
+    Natural Language :: English
     Programming Language :: Python
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: Implementation :: CPython
 
 [options]
 packages = find:
-package_dir = =src
+python_requires = >=3.7
 include_package_data = True
+package_dir = =src
 
 [options.packages.find]
 where = src
 
 [options.extras_require]
-idna2008 = idna
+idna2008 =
+    idna
 
 [options.package_data]
 * =

src/rfc3986/__init__.py

@@ -33,7 +33,7 @@
 __author_email__ = "graffatcolmingov@gmail.com"
 __license__ = "Apache v2.0"
 __copyright__ = "Copyright 2014 Rackspace; 2016 Ian Stapleton Cordasco"
-__version__ = "1.5.0"
+__version__ = "2.0.0"
 
 __all__ = (
     "ParseResult",