Refactor structure of modules, upgrading version class

AntoineBuirey · AntoineBuirey · commit 6a4d918f2b4d · 2025-05-06T19:17:00.000+02:00
diff --git a/cache/cache/__init__.py b/cache/cache/__init__.py
@@ -0,0 +1 @@
+from .cache import Cache
diff --git a/cache/cache/cache.py b/cache/cache/cache.py
diff --git a/cache/pyproject.toml b/cache/pyproject.toml
@@ -11,12 +11,16 @@ authors = [
 ]
 requires-python = ">=3.10"
 
+[tool.setuptools.packages.find]
+include = [
+    "cache"
+]
 
 [tool.pytest.ini_options]
 minversion = "8.0"
 testpaths = [
-    "."
+    "tests"
 ]
 python_files = [
-    "tests.py"
+    "*tests.py"
 ]
diff --git a/cache/tests/cache_tests.py b/cache/tests/cache_tests.py
@@ -1,6 +1,6 @@
 import time
 from datetime import timedelta, datetime
-from cache import Cache
+from cache.cache import Cache
 import pytest
 
 def test_cache_expire_in_caches_result():
diff --git a/colors/colors/__init__.py b/colors/colors/__init__.py
@@ -0,0 +1 @@
+from .colors import Color
diff --git a/colors/colors/colors.py b/colors/colors/colors.py
diff --git a/colors/pyproject.toml b/colors/pyproject.toml
@@ -7,12 +7,16 @@ authors = [
 ]
 requires-python = ">=3.10"
 
+[tool.setuptools.packages.find]
+include = [
+    "colors"
+]
 
 [tool.pytest.ini_options]
 minversion = "8.0"
 testpaths = [
-    "."
+    "tests"
 ]
 python_files = [
-    "tests.py"
+    "*tests.py"
 ]
diff --git a/colors/tests/colors_tests.py b/colors/tests/colors_tests.py
@@ -1,5 +1,5 @@
 import pytest
-from colors import Color
+from colors.colors import Color
 
 @pytest.mark.parametrize(
     "hexa, expected, test_id",
diff --git a/config/config/__init__.py b/config/config/__init__.py
@@ -0,0 +1 @@
+from .config import BaseConfig, JSONConfig
diff --git a/config/config/config.py b/config/config/config.py
diff --git a/config/pyproject.toml b/config/pyproject.toml
@@ -1,3 +1,7 @@
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
 [project]
 name = "config"
 dynamic = ["version"]
@@ -7,14 +11,16 @@ authors = [
 ]
 requires-python = ">=3.10"
 
-[tool.setuptools]
-packages = { find = { include = ["config*"], exclude = ["*_tests"] } }
+[tool.setuptools.packages.find]
+include = [
+    "config"
+]
 
 [tool.pytest.ini_options]
 minversion = "8.0"
 testpaths = [
-    "."
+    "tests"
 ]
 python_files = [
-    "*_tests.py"
+    "*tests.py"
 ]
diff --git a/config/tests/base_tests.py b/config/tests/base_tests.py
@@ -1,6 +1,6 @@
 import pytest
 from typing import Any
-from config import BaseConfig
+from config.config import BaseConfig
 
 
 # Minimal concrete subclass for testing
diff --git a/config/tests/json_tests.py b/config/tests/json_tests.py
@@ -4,7 +4,7 @@
 import tempfile
 import time
 from datetime import datetime, timedelta
-from config import JSONConfig
+from config.config import JSONConfig
 from time import sleep
 
 
diff --git a/get_version.py b/get_version.py
@@ -0,0 +1,14 @@
+from version.version import Version
+import os
+
+tags = [Version.from_string(t) for t in os.listdir(".git/refs/tags")]
+tags.sort(reverse=True)
+
+branch = os.popen("git rev-parse --abbrev-ref HEAD").read().strip()
+last_commit = os.popen("git rev-parse HEAD").read().strip()
+
+version = tags[0] if tags else Version(0, 0, 0)
+version.patch_increment()
+version.prerelease = "alpha"
+version.metadata = f"{branch}.{last_commit}"
+print(version)
diff --git a/http_code/http_code/__init__.py b/http_code/http_code/__init__.py
@@ -0,0 +1 @@
+from .http_code import HttpCode
diff --git a/http_code/http_code/http_code.py b/http_code/http_code/http_code.py
diff --git a/http_code/pyproject.toml b/http_code/pyproject.toml
@@ -7,12 +7,16 @@ authors = [
 ]
 requires-python = ">=3.10"
 
+[tool.setuptools.packages.find]
+include = [
+    "http_code"
+]
 
 [tool.pytest.ini_options]
 minversion = "8.0"
 testpaths = [
-    "."
+    "tests"
 ]
 python_files = [
-    "tests.py"
+    "*tests.py"
 ]
diff --git a/http_code/tests/http_code_tests.py b/http_code/tests/http_code_tests.py
@@ -1,4 +1,4 @@
-from http_code import HttpCode
+from http_code.http_code.http_code import HttpCode
 import pytest
 
 
diff --git a/makefile b/makefile
@@ -1,5 +1,5 @@
 
-VERSION = 0.1.0
+VERSION = $(shell python get_version.py)
 
 MODULES = cache colors config http_code version
 
@@ -10,11 +10,13 @@ TARGETS += $(addprefix dist/,$(addsuffix -$(VERSION)-py3-none-any.whl,$(MODULES)
 
 all: $(TARGETS)
 
-dist/%-$(VERSION)-py3-none-any.whl: %
+dist/%-$(VERSION)-py3-none-any.whl: % %/pyproject.toml
 	python build_package.py --version $(VERSION) --wheel --outdir dist $<
+	@rm -rf $</$<.egg-info $</build
 
-dist/%-$(VERSION).tar.gz: %
+dist/%-$(VERSION).tar.gz: % %/pyproject.toml
 	python build_package.py --version $(VERSION) --sdist --outdir dist $<
+	@rm -rf $</$<.egg-info $</build
 
 tests/%: % #with pytest
 	-@coverage run --data-file $<.coverage --branch -m pytest --tb=short --disable-warnings --junitxml=tests_reports/$*/report.xml $<
@@ -27,3 +29,4 @@ tests: $(addprefix tests/,$(MODULES))
 
 clean:
 	rm -rf dist
+	rm -rf **/*.egg-info **/build
diff --git a/version/pyproject.toml b/version/pyproject.toml
@@ -7,12 +7,16 @@ authors = [
 ]
 requires-python = ">=3.10"
 
+[tool.setuptools.packages.find]
+include = [
+    "version"
+]
 
 [tool.pytest.ini_options]
 minversion = "8.0"
 testpaths = [
     "."
 ]
 python_files = [
-    "tests.py"
+    "*tests.py"
 ]
diff --git a/version/tests/version_tests.py b/version/tests/version_tests.py
@@ -1,4 +1,4 @@
-from version import Version
+from version.version import Version
 import pytest
 
 def test_version_initialization():
@@ -375,4 +375,30 @@ def test_version_prerelease_decrement_no_prerelease():
     ]
 )
 def test_version_semver_example(version1, version2):
-    assert version1 < version2
+    assert version1 < version2
+
+def test_getters_and_setters():
+    v = Version(1, 2, 3)
+    v.major = 5
+    v.minor = 6
+    v.patch = 7
+    v.prerelease = "rc.1"
+    v.metadata = "build.2"
+    assert v.major == 5
+    assert v.minor == 6
+    assert v.patch == 7
+    assert v.prerelease == "rc.1"
+    assert v.metadata == "build.2"
+
+def test_setters_invalid_values():
+    v = Version(1, 2, 3)
+    with pytest.raises(ValueError):
+        v.major = "a"
+    with pytest.raises(ValueError):
+        v.minor = "b"
+    with pytest.raises(ValueError):
+        v.patch = "c"
+    with pytest.raises(ValueError):
+        v.prerelease = "invalid@prerelease"
+    with pytest.raises(ValueError):
+        v.metadata = "invalid@meta"
diff --git a/version/version/__init__.py b/version/version/__init__.py
@@ -0,0 +1 @@
+from .version import Version
diff --git a/version/version/version.py b/version/version/version.py

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,16 @@ authors = [`
`11`	`11`	`]`
`12`	`12`	`requires-python = ">=3.10"`
`13`	`13`
	`14`	`+[tool.setuptools.packages.find]`
	`15`	`+include = [`
	`16`	`+ "cache"`
	`17`	`+]`
`14`	`18`
`15`	`19`	`[tool.pytest.ini_options]`
`16`	`20`	`minversion = "8.0"`
`17`	`21`	`testpaths = [`
`18`		`- "."`
	`22`	`+ "tests"`
`19`	`23`	`]`
`20`	`24`	`python_files = [`
`21`		`- "tests.py"`
	`25`	`+ "*tests.py"`
`22`	`26`	`]`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,16 @@ authors = [`
`7`	`7`	`]`
`8`	`8`	`requires-python = ">=3.10"`
`9`	`9`
	`10`	`+[tool.setuptools.packages.find]`
	`11`	`+include = [`
	`12`	`+ "colors"`
	`13`	`+]`
`10`	`14`
`11`	`15`	`[tool.pytest.ini_options]`
`12`	`16`	`minversion = "8.0"`
`13`	`17`	`testpaths = [`
`14`		`- "."`
	`18`	`+ "tests"`
`15`	`19`	`]`
`16`	`20`	`python_files = [`
`17`		`- "tests.py"`
	`21`	`+ "*tests.py"`
`18`	`22`	`]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+from .config import BaseConfig, JSONConfig`