BUMP-VERSION: 0.6.1 (was: 0.6.0)

* Change LICENSE from BSD to MIT (same as: parse module) * Use SPDX-License-Identifier in source code * pytest.ini: Remove version-info arg FIXES: * Issue #1 -- License confusion
jenisys · Jul 2, 2023 · 36f9cfb · 36f9cfb
1 parent 1a387ec
commit 36f9cfb
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 41 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,6 +1,6 @@
 [bumpversion]
-current_version = 0.6.0
-files = setup.py parse_type/__init__.py .bumpversion.cfg pytest.ini
+current_version = 0.6.1
+files = setup.py parse_type/__init__.py .bumpversion.cfg
 commit = False
 tag = False
 allow_dirty = True
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 *.py[cod]
 
-# Packages
+# -- TEMPORARY PYTHON PACKAGE PARTS:
 MANIFEST
 *.egg
 *.egg-info
@@ -15,7 +15,7 @@ pip-log.txt
 Pipfile
 Pipfile.lock
 
-# Unit test / coverage reports
+# -- TESTS, COVERAGE REPORTS, ...
 .cache/
 .direnv/
 .eggs/

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -9,12 +9,15 @@ include *.ini
 include *.cfg
 include *.yaml
 include bin/invoke*
+exclude __*.rst
+exclude __*.txt
 
-recursive-include bin           *.sh *.py *.cmd
+recursive-include bin            *.cmd *.py *.sh
 recursive-include py.requirements  *.txt
-recursive-include tasks         *.py *.txt *.rst *.zip
+recursive-include tasks         *.py *.txt
 recursive-include tests         *.py
 # -- DISABLED: recursive-include docs          *.rst *.txt *.py
 
+prune .direnv
 prune .tox
 prune .venv*
diff --git a/parse_type/__init__.py b/parse_type/__init__.py
@@ -1,4 +1,6 @@
-# -*- coding: utf-8 -*-
+# -*- coding: UTF-8 -*-
+# Copyright 2013 - 2023, jenisys
+# SPDX-License-Identifier: MIT
 """
 This module extends the :mod:`parse` to build and derive additional
 parse-types from other, existing types.
@@ -9,25 +11,4 @@
 from parse_type.builder import TypeBuilder, build_type_dict
 
 __all__ = ["Cardinality", "TypeBuilder", "build_type_dict"]
-__version__ = "0.6.0"
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2012-2020 by Jens Engel (https://github/jenisys/)
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice shall be included in
-#  all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
+__version__ = "0.6.1"
diff --git a/py.requirements/develop.txt b/py.requirements/develop.txt
@@ -9,7 +9,9 @@
 bump2version >= 0.5.6
 
 # -- RELEASE MANAGEMENT: Push package to pypi.
+build >= 0.5.1
 twine >= 1.13.0
+wheel
 
 # -- PYTHON2/PYTHON3 COMPATIBILITY:
 modernize >= 0.5
@@ -23,7 +25,8 @@ coverage >= 4.4
 pytest-cov
 
 tox   >= 1.8.1,<4.0     # -- HINT: tox >= 4.0 has breaking changes.
-virtualenv < 20.22.0    # -- SUPPORT FOR: Python 2.7, Python <= 3.6
+virtualenv <  20.22.0; python_version <= '3.6'  # -- SUPPORT FOR: Python 2.7, Python <= 3.6
+virtualenv >= 20.0.0;  python_version >  '3.6'
 argparse    # -- NEEDED-FOR: toxcmd.py
 
 # -- RELATED:

diff --git a/py.requirements/docs.txt b/py.requirements/docs.txt
@@ -1,6 +1,6 @@
 # ============================================================================
-# PYTHON PACKAGE REQUIREMENTS: For documentation generation
+# PYTHON PACKAGE REQUIREMENTS: For documentation generation (PREPARED)
 # ============================================================================
-# sphinxcontrib-cheeseshop >= 0.2
 
-Sphinx >= 1.5
+Sphinx >=1.6
+sphinx_bootstrap_theme >= 0.6.0
diff --git a/pytest.ini b/pytest.ini
@@ -19,7 +19,6 @@ testpaths     = tests
 python_files  = test_*.py
 junit_family = xunit2
 addopts = --metadata PACKAGE_UNDER_TEST parse_type
-    --metadata PACKAGE_VERSION 0.6.0
     --html=build/testing/report.html --self-contained-html
     --junit-xml=build/testing/report.xml
 # markers =

diff --git a/setup.py b/setup.py
@@ -53,15 +53,15 @@ def find_packages_by_root_package(where):
 # -----------------------------------------------------------------------------
 setup(
     name = "parse_type",
-    version = "0.6.0",
+    version = "0.6.1",
     author = "Jens Engel",
     author_email = "jenisys@noreply.github.com",
     url = "https://github.com/jenisys/parse_type",
     download_url= "http://pypi.python.org/pypi/parse_type",
     description = "Simplifies to build parse types based on the parse module",
     long_description = long_description,
     keywords= "parse, parsing",
-    license = "BSD",
+    license = "MIT",
     packages = find_packages_by_root_package("parse_type"),
     include_package_data = True,
 
@@ -70,8 +70,6 @@ def find_packages_by_root_package(where):
     install_requires=[
         "parse >= 1.18.0; python_version >= '3.0'",
         "parse >= 1.13.1; python_version <= '2.7'",
-        # -- MAYBE, related to issue #15:
-        # "parse == 1.13.1; python_version <= '2.7'",
         "enum34; python_version < '3.4'",
         "six >= 1.15",
     ],
@@ -81,14 +79,23 @@ def find_packages_by_root_package(where):
         "pytest-html >= 1.19.0",
     ],
     extras_require={
-        'docs': ["sphinx>=1.2"],
+        'docs': [
+            "Sphinx >=1.6",
+            "sphinx_bootstrap_theme >= 0.6.0"
+        ],
         'develop': [
+            "build >= 0.5.1",
+            "twine >= 1.13.0",
             "coverage >= 4.4",
-            "pytest <  5.0; python_version <  '3.0'", # >= 4.2
+            "pytest <  5.0; python_version <  '3.0'",  # >= 4.2
             "pytest >= 5.0; python_version >= '3.0'",
             "pytest-html >= 1.19.0",
             "pytest-cov",
             "tox >=2.8,<4.0",
+            "virtualenv <  20.22.0; python_version <= '3.6'",  # -- SUPPORT FOR: Python 2.7, Python <= 3.6
+            "virtualenv >= 20.0.0;  python_version >  '3.6'",
+            "ruff; python_version >=  '3.7'",
+            "pylint",
         ],
     },
 
@@ -101,6 +108,7 @@ def find_packages_by_root_package(where):
         "Environment :: Console",
         "Environment :: Web Environment",
         "Intended Audience :: Developers",
+        "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.2",
@@ -117,7 +125,6 @@ def find_packages_by_root_package(where):
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Software Development :: Code Generators",
         "Topic :: Software Development :: Libraries :: Python Modules",
-        "License :: OSI Approved :: BSD License",
     ],
     platforms = ['any'],
 )