Merge pull request #1 from Hochfrequenz/add-deps

➕ Add `ebdamame` and `rebdhuhn` as dependencies; Rename sample project
Hochfrequenz · May 2, 2024 · 813e68d · 813e68d
2 parents f682255 + e3296a3
commit 813e68d
Show file tree

Hide file tree

Showing 14 changed files with 98 additions and 106 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
diff --git a/dev_requirements/requirements-coverage.txt b/dev_requirements/requirements-coverage.txt
@@ -6,4 +6,4 @@
 #    pip-compile-multi
 #
 coverage==7.5.0
-    # via -r dev_requirements/requirements-coverage.in
+    # via -r dev_requirements\requirements-coverage.in
diff --git a/dev_requirements/requirements-formatting.txt b/dev_requirements/requirements-formatting.txt
@@ -6,16 +6,18 @@
 #    pip-compile-multi
 #
 black==24.4.2
-    # via -r dev_requirements/requirements-formatting.in
+    # via -r dev_requirements\requirements-formatting.in
 click==8.1.7
     # via black
+colorama==0.4.6
+    # via click
 isort==5.13.2
-    # via -r dev_requirements/requirements-formatting.in
+    # via -r dev_requirements\requirements-formatting.in
 mypy-extensions==1.0.0
     # via black
 packaging==24.0
     # via black
 pathspec==0.12.1
     # via black
-platformdirs==4.2.0
+platformdirs==4.2.1
     # via black
diff --git a/dev_requirements/requirements-linting.txt b/dev_requirements/requirements-linting.txt
@@ -15,7 +15,7 @@ isort==5.13.2
     # via pylint
 mccabe==0.7.0
     # via pylint
-platformdirs==4.2.0
+platformdirs==4.2.1
     # via pylint
 pylint==3.1.0
     # via -r dev_requirements\requirements-linting.in

diff --git a/dev_requirements/requirements-packaging.txt b/dev_requirements/requirements-packaging.txt
@@ -1,53 +1,58 @@
+# SHA1:93e4fbf2b6cce1574fe3d5315360512fa9927699
 #
-# This file is autogenerated by pip-compile with Python 3.12
-# by the following command:
+# This file is autogenerated by pip-compile-multi
+# To update, run:
 #
-#    pip-compile dev_requirements/requirements-packaging.in
+#    pip-compile-multi
 #
+backports-tarfile==1.1.1
+    # via jaraco-context
 build==1.2.1
-    # via -r requirements-packaging.in
+    # via -r dev_requirements\requirements-packaging.in
 certifi==2024.2.2
     # via requests
-cffi==1.16.0
-    # via cryptography
 charset-normalizer==3.3.2
     # via requests
-cryptography==42.0.5
-    # via secretstorage
-docutils==0.20.1
+colorama==0.4.6
+    # via build
+docutils==0.21.2
     # via readme-renderer
 idna==3.7
     # via requests
-importlib-metadata==7.0.2
-    # via twine
-jaraco-classes==3.3.1
-    # via keyring
-jeepney==0.8.0
+importlib-metadata==7.1.0
     # via
     #   keyring
-    #   secretstorage
-keyring==24.3.1
+    #   twine
+jaraco-classes==3.4.0
+    # via keyring
+jaraco-context==5.3.0
+    # via keyring
+jaraco-functools==4.0.1
+    # via keyring
+keyring==25.2.0
     # via twine
 markdown-it-py==3.0.0
     # via rich
 mdurl==0.1.2
     # via markdown-it-py
 more-itertools==10.2.0
-    # via jaraco-classes
-nh3==0.2.15
+    # via
+    #   jaraco-classes
+    #   jaraco-functools
+nh3==0.2.17
     # via readme-renderer
 packaging==24.0
     # via build
 pkginfo==1.10.0
     # via twine
-pycparser==2.21
-    # via cffi
 pygments==2.17.2
     # via
     #   readme-renderer
     #   rich
-pyproject-hooks==1.0.0
+pyproject-hooks==1.1.0
     # via build
+pywin32-ctypes==0.2.2
+    # via keyring
 readme-renderer==43.0
     # via twine
 requests==2.31.0
@@ -60,10 +65,8 @@ rfc3986==2.0.0
     # via twine
 rich==13.7.1
     # via twine
-secretstorage==3.3.3
-    # via keyring
 twine==5.0.0
-    # via -r requirements-packaging.in
+    # via -r dev_requirements\requirements-packaging.in
 urllib3==2.2.1
     # via
     #   requests

diff --git a/dev_requirements/requirements-tests.txt b/dev_requirements/requirements-tests.txt
@@ -5,11 +5,13 @@
 #
 #    pip-compile-multi
 #
+colorama==0.4.6
+    # via pytest
 iniconfig==2.0.0
     # via pytest
 packaging==24.0
     # via pytest
 pluggy==1.5.0
     # via pytest
 pytest==8.2.0
-    # via -r dev_requirements/requirements-tests.in
+    # via -r dev_requirements\requirements-tests.in
diff --git a/dev_requirements/requirements-type_check.txt b/dev_requirements/requirements-type_check.txt
@@ -6,8 +6,8 @@
 #    pip-compile-multi
 #
 mypy==1.10.0
-    # via -r dev_requirements/requirements-type_check.in
+    # via -r dev_requirements\requirements-type_check.in
 mypy-extensions==1.0.0
     # via mypy
-typing-extensions==4.10.0
+typing-extensions==4.11.0
     # via mypy
diff --git a/pyproject.toml b/pyproject.toml
@@ -16,7 +16,10 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
 ]
-dependencies = []     # add all the dependencies here
+dependencies = [
+    "ebdamame>=0.1.1",
+    "rebdhuhn" #  no min version because of https://github.com/Hochfrequenz/rebdhuhn/issues/202
+]     # add all the dependencies here
 dynamic = ["readme", "version"]
 
 [project.urls]

diff --git a/requirements.txt b/requirements.txt
@@ -4,3 +4,55 @@
 #
 #    pip-compile pyproject.toml
 #
+attrs==23.2.0
+    # via
+    #   cattrs
+    #   ebdamame
+    #   ebdtable2graph
+    #   rebdhuhn
+cattrs==23.2.3
+    # via
+    #   ebdtable2graph
+    #   rebdhuhn
+certifi==2024.2.2
+    # via requests
+charset-normalizer==3.3.2
+    # via requests
+click==8.1.7
+    # via ebdamame
+colorama==0.4.6
+    # via click
+ebdamame==0.1.1
+    # via your-favourite-package-name (pyproject.toml)
+ebdtable2graph==0.1.20
+    # via ebdamame
+idna==3.7
+    # via requests
+lxml==5.2.1
+    # via
+    #   ebdtable2graph
+    #   python-docx
+    #   rebdhuhn
+    #   svgutils
+more-itertools==10.2.0
+    # via ebdamame
+networkx==3.3
+    # via
+    #   ebdtable2graph
+    #   rebdhuhn
+python-docx==1.1.2
+    # via ebdamame
+rebdhuhn==0.0.0
+    # via your-favourite-package-name (pyproject.toml)
+requests==2.31.0
+    # via
+    #   ebdtable2graph
+    #   rebdhuhn
+svgutils==0.3.4
+    # via
+    #   ebdtable2graph
+    #   rebdhuhn
+typing-extensions==4.11.0
+    # via python-docx
+urllib3==2.2.1
+    # via requests
diff --git a/src/mypackage/__init__.py → src/ebd_toolchain/__init__.py b/src/mypackage/__init__.py → src/ebd_toolchain/__init__.py
diff --git a/src/mypackage/mymodule.py → src/ebd_toolchain/mymodule.py b/src/mypackage/mymodule.py → src/ebd_toolchain/mymodule.py
diff --git a/src/mypackage/py.typed → src/ebd_toolchain/py.typed b/src/mypackage/py.typed → src/ebd_toolchain/py.typed
diff --git a/tox.ini b/tox.ini
@@ -26,7 +26,7 @@ deps =
     # add your fixtures like e.g. pytest_datafiles here
 setenv = PYTHONPATH = {toxinidir}/src
 commands =
-    pylint mypackage
+    pylint ebd_toolchain
     pylint unittests --rcfile=unittests/.pylintrc
     # add single files (ending with .py) or packages here
 
@@ -37,7 +37,7 @@ deps =
     {[testenv:tests]deps}
     -r dev_requirements/requirements-type_check.txt
 commands =
-    mypy --show-error-codes src/mypackage --strict
+    mypy --show-error-codes src/ebd_toolchain --strict
     mypy --show-error-codes unittests --strict
     # add single files (ending with .py) or packages here
 

diff --git a/unittests/test_myclass.py b/unittests/test_myclass.py
@@ -1,4 +1,4 @@
-from mypackage.mymodule import MyClass
+from ebd_toolchain.mymodule import MyClass
 
 
 class TestMyClass: