From 8947621a6100141261ec157bc73320d219be48ed Mon Sep 17 00:00:00 2001 From: Austin Orr Date: Mon, 29 Apr 2024 13:23:45 -0700 Subject: [PATCH 1/2] removed non-consensus tooling; can add back after consensus & dependencies & documentation are included --- pyproject.toml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 01326ec9..45c30305 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,24 +53,6 @@ hsp2 = "HSP2tools.HSP2_CLI:main" documentation = "http://www.respec.com/product/hydrologic-simulation-program-python-hsp%C2%B2/" github = "https://github.com/respec/HSPsquared" -[tool.check-manifest] -ignore = [ - "docs/_function_autosummary/*", - ".coverage", - ".deepsource.toml", - ".ipynb_checkpoints/*" -] - -[tool.commitizen] -name = "cz_conventional_commits" -tag_format = "v$version" -update_changelog_on_bump = true -version = "0.11.0a1" -version_files = ["VERSION"] - -[tool.isort] -profile = "black" - [tool.setuptools] license-files = ["LICENSE"] include-package-data = true From 18e663c3a1cf9ce055ab45328558a6fe82d5ba73 Mon Sep 17 00:00:00 2001 From: Austin Orr Date: Mon, 29 Apr 2024 14:02:14 -0700 Subject: [PATCH 2/2] working install, clean packaging, working test case --- HSP2/__init__.py | 3 +-- HSP2/_version.py | 1 + VERSION | 1 - _version.py | 4 ---- pyproject.toml | 5 ++--- 5 files changed, 4 insertions(+), 10 deletions(-) create mode 100644 HSP2/_version.py delete mode 100644 VERSION delete mode 100644 _version.py diff --git a/HSP2/__init__.py b/HSP2/__init__.py index 2e457495..9a9cff6c 100644 --- a/HSP2/__init__.py +++ b/HSP2/__init__.py @@ -6,5 +6,4 @@ from HSP2.main import main from HSP2.mainDoE import main as mainDoE from HSP2.utilities import versions, flowtype -from _version import __version__ - +from HSP2._version import __version__ diff --git a/HSP2/_version.py b/HSP2/_version.py new file mode 100644 index 00000000..632057c8 --- /dev/null +++ b/HSP2/_version.py @@ -0,0 +1 @@ +__version__ = "0.11.0a1" diff --git a/VERSION b/VERSION deleted file mode 100644 index e0cbcd58..00000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.11.0a1 diff --git a/_version.py b/_version.py deleted file mode 100644 index 2fb6788e..00000000 --- a/_version.py +++ /dev/null @@ -1,4 +0,0 @@ -import os - -with open(os.path.join(os.path.dirname(__file__), "VERSION"), encoding="ascii") as version_file: - __version__ = version_file.read().strip() diff --git a/pyproject.toml b/pyproject.toml index 45c30305..7203231e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,10 +59,9 @@ include-package-data = true [tool.setuptools.dynamic] readme = {file = "README.rst"} -version = {file = "VERSION"} +version = {attr = "HSP2._version.__version__"} [tool.setuptools.packages.find] -exclude = ["tests*", "examples*", "tools*", "docs*"] -where = ["HSP2", "HSP2tools", "HSP2IO"] +include = ["HSP2", "HSP2tools", "HSP2IO"] [tool.setuptools_scm]