diff --git a/doc/Dependency.rst b/doc/Dependency.rst index f1d67600..a1683daa 100644 --- a/doc/Dependency.rst +++ b/doc/Dependency.rst @@ -50,7 +50,7 @@ PyPI (see :ref:`INSTALL`). +---------------------------------------------------------------------------+-------------+-------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------+ | **Package** | **Version** | **License** | **Dependencies** | +===========================================================================+=============+===========================================================================================+========================================================================================================================================================+ -| `pyTooling[terminal] `__ | ≥6.0.0 | `Apache License, 2.0 `__ | * colorama | +| `pyTooling[terminal] `__ | ≥6.1.0 | `Apache License, 2.0 `__ | * colorama | +---------------------------------------------------------------------------+--------------+------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------+ | `ruamel.yaml `__ | ≥0.18 | `MIT `__ | *Not yet evaluated.* | +---------------------------------------------------------------------------+--------------+------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -94,17 +94,17 @@ the mandatory dependencies too. +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ | **Package** | **Version** | **License** | **Dependencies** | +=====================================================================+=============+========================================================================================+======================+ -| `pytest `__ | ≥7.4.0 | `MIT `__ | *Not yet evaluated.* | +| `pytest `__ | ≥8.1 | `MIT `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ -| `pytest-cov `__ | ≥4.1.0 | `MIT `__ | *Not yet evaluated.* | +| `pytest-cov `__ | ≥5.0 | `MIT `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ | `Coverage `__ | ≥7.4 | `Apache License, 2.0 `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ -| `mypy `__ | ≥1.8.0 | `MIT `__ | *Not yet evaluated.* | +| `mypy `__ | ≥1.9 | `MIT `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ -| `typing-extensions `__ | ≥4.9.0 | `PSF-2.0 `__ | *Not yet evaluated.* | +| `typing-extensions `__ | ≥4.11 | `PSF-2.0 `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ -| `lxml `__ | ≥5.0 | `BSD 3-Clause `__ | *Not yet evaluated.* | +| `lxml `__ | ≥5.1 | `BSD 3-Clause `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ @@ -144,9 +144,9 @@ the mandatory dependencies too. +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | **Package** | **Version** | **License** | **Dependencies** | +=================================================================================================+==============+==========================================================================================================+======================================================================================================================================================+ -| `pyTooling `__ | ≥6.0.0 | `Apache License, 2.0 `__ | *None* | +| `pyTooling `__ | ≥6.1.0 | `Apache License, 2.0 `__ | *None* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ -| `Sphinx `__ | ≥5.3.0 | `BSD 3-Clause `__ | *Not yet evaluated.* | +| `Sphinx `__ | ≥7.2.0 | `BSD 3-Clause `__ | *Not yet evaluated.* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | `sphinxcontrib-mermaid `__ | ≥0.9.2 | `BSD `__ | *Not yet evaluated.* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -201,7 +201,7 @@ install the mandatory dependencies too. +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | **Package** | **Version** | **License** | **Dependencies** | +============================================================================+==============+==========================================================================================================+======================================================================================================================================================+ -| `pyTooling `__ | ≥6.0.0 | `Apache License, 2.0 `__ | *None* | +| `pyTooling `__ | ≥6.1.0 | `Apache License, 2.0 `__ | *None* | +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | `wheel `__ | ≥0.40.0 | `MIT `__ | *Not yet evaluated.* | +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ diff --git a/doc/requirements.txt b/doc/requirements.txt index d9ec4715..b40b0e14 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,11 +1,11 @@ -r ../requirements.txt -pyTooling ~= 6.0 +pyTooling ~= 6.1 colorama >= 0.4.6 # Enforce latest version on ReadTheDocs -sphinx >= 7.2, < 8.0 -docutils >= 0.18.0, < 0.19.0 +sphinx ~= 7.2 +docutils ~= 0.18.0 # ReadTheDocs Theme sphinx_rtd_theme ~= 2.0.0 @@ -20,7 +20,7 @@ autoapi >= 2.0.1 sphinx_design >= 0.5.0 sphinx-copybutton >= 0.5.2 sphinx_autodoc_typehints >= 1.25.2 -sphinx_reports ~= 0.5 +sphinx_reports ~= 0.6 # changelog>=0.3.5 # BuildTheDocs Extensions (mostly patched Sphinx extensions) diff --git a/pyVersioning/Configuration.py b/pyVersioning/Configuration.py index 11cc7b4d..79af4d2f 100644 --- a/pyVersioning/Configuration.py +++ b/pyVersioning/Configuration.py @@ -60,7 +60,7 @@ def __init__(self, root: 'Base', parent: 'Base', settings: Dict) -> None: self.name = settings["name"] self.variant = settings["variant"] if "variant" in settings else None - self.version = SemanticVersion(settings["version"]) if "version" in settings else None + self.version = SemanticVersion.Parse(settings["version"]) if "version" in settings else None class Build(Base): class Compiler(Base): diff --git a/pyVersioning/__init__.py b/pyVersioning/__init__.py index 008e366f..b4f1b617 100644 --- a/pyVersioning/__init__.py +++ b/pyVersioning/__init__.py @@ -32,7 +32,7 @@ __email__ = "Paebbels@gmail.com" __copyright__ = "2020-2024, Patrick Lehmann" __license__ = "Apache License, Version 2.0" -__version__ = "0.13.1" +__version__ = "0.13.2" __keywords__ = ["Python3", "Template", "Versioning", "Git"] from dataclasses import make_dataclass @@ -241,9 +241,9 @@ def __init__(self, name: str, version: Union[str, SemanticVersion, None] = None, if isinstance(version, SemanticVersion): self._version = version elif isinstance(version, str): - self._version = SemanticVersion(version) + self._version = SemanticVersion.Parse(version) elif version is None: - self._version = SemanticVersion("v0.0.0") + self._version = SemanticVersion.Parse("v0.0.0") @readonly def name(self) -> str: @@ -280,9 +280,9 @@ def __init__(self, name: str, version: Union[str, SemanticVersion] = "", configu if isinstance(version, SemanticVersion): self._version = version elif isinstance(version, str): - self._version = SemanticVersion(version) + self._version = SemanticVersion.Parse(version) elif version is None: - self._version = SemanticVersion("v0.0.0") + self._version = SemanticVersion.Parse("v0.0.0") @readonly def name(self) -> str: @@ -421,7 +421,7 @@ def CollectData(self) -> None: else: self._service = WorkStation() - self._variables["tool"] = Tool("pyVersioning", SemanticVersion(__version__)) + self._variables["tool"] = Tool("pyVersioning", SemanticVersion.Parse(__version__)) self._variables["git"] = self.GetGitInformation() self._variables["env"] = self.GetEnvironment() self._variables["platform"] = self._service.GetPlatform() @@ -436,7 +436,7 @@ def GetVersion(self, config: Configuration.Project) -> SemanticVersion: if config.version is not None: return config.version else: - return SemanticVersion("0.0.0") + return SemanticVersion.Parse("0.0.0") def GetGitInformation(self) -> Git: return Git( @@ -616,7 +616,7 @@ def GetBuild(self, config: Configuration.Build) -> Build: def GetCompiler(self, config: Configuration.Build.Compiler) -> Compiler: return Compiler( name=config.name, - version=SemanticVersion(config.version), + version=SemanticVersion.Parse(config.version), configuration=config.configuration, options=config.options ) diff --git a/pyproject.toml b/pyproject.toml index 2fb89c16..6fd1ddab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ requires = [ "setuptools >= 69.0.0", "wheel >= 0.40.0", - "pyTooling ~= 6.0" + "pyTooling ~= 6.1" ] build-backend = "setuptools.build_meta" diff --git a/requirements.txt b/requirements.txt index 5359bfec..e4ea45dc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ -ruamel.yaml >= 0.18.5 - -pyTooling[terminal] ~= 6.0 +ruamel.yaml ~= 0.18.6 +pyTooling[terminal] ~= 6.1 diff --git a/tests/requirements.txt b/tests/requirements.txt index db0afa85..021cd377 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,13 +1,13 @@ -r ../requirements.txt # Coverage collection -Coverage >= 7.4 +Coverage ~= 7.4 # Test Runner -pytest >= 7.4.0 -pytest-cov >= 4.1.0 +pytest ~= 8.1 +pytest-cov ~= 5.0 # Static Type Checking -mypy >= 1.8.0 -typing_extensions >= 4.9.0 -lxml >= 5.0 +mypy ~= 1.9 +typing_extensions ~= 4.11 +lxml ~= 5.1 diff --git a/tests/unit/Database.py b/tests/unit/Database.py index 0356c83c..6833a717 100644 --- a/tests/unit/Database.py +++ b/tests/unit/Database.py @@ -51,7 +51,7 @@ def test_ProjectName(self) -> None: self.assertEqual(project.name, name) self.assertEqual(project.variant, variant) - self.assertEqual(project.version, SemanticVersion("0.0.0")) + self.assertEqual(project.version, SemanticVersion.Parse("0.0.0")) def test_ProjectName_VariantName(self) -> None: name = "Project 1" @@ -61,7 +61,7 @@ def test_ProjectName_VariantName(self) -> None: self.assertEqual(project.name, name) self.assertEqual(project.variant, variant) - self.assertEqual(project.version, SemanticVersion("0.0.0")) + self.assertEqual(project.version, SemanticVersion.Parse("0.0.0")) def test_ProjectName_VersionAsString(self) -> None: name = "Project 1" @@ -72,12 +72,12 @@ def test_ProjectName_VersionAsString(self) -> None: self.assertEqual(project.name, name) self.assertEqual(project.variant, variant) - self.assertEqual(project.version, SemanticVersion(version)) + self.assertEqual(project.version, SemanticVersion.Parse(version)) def test_ProjectName_VersionAsVersion(self) -> None: name = "Project 1" variant = "" - version = SemanticVersion("1.3.2") + version = SemanticVersion.Parse("1.3.2") project = pyV_Project(name, version)