From 93148f266b4e3a6a278721906368758d9fd45baa Mon Sep 17 00:00:00 2001 From: konstantin Date: Thu, 2 May 2024 09:20:21 +0200 Subject: [PATCH 1/4] =?UTF-8?q?=E2=9E=95=20Add=20`ebdamame`=20and=20`rebdh?= =?UTF-8?q?uhn`=20as=20dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 5 ++++- requirements.txt | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 67de3ed..b63f501 100644 --- 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 index 79ca470..7549c19 100644 --- 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 From 1d088dd4db6b798a87a60f76d70649114c21dc30 Mon Sep 17 00:00:00 2001 From: konstantin Date: Thu, 2 May 2024 09:21:34 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20`mypackage`=20to=20?= =?UTF-8?q?`ebd=5Ftoolchain`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/{mypackage => ebd_toolchain}/__init__.py | 0 src/{mypackage => ebd_toolchain}/mymodule.py | 0 src/{mypackage => ebd_toolchain}/py.typed | 0 tox.ini | 4 ++-- unittests/test_myclass.py | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename src/{mypackage => ebd_toolchain}/__init__.py (100%) rename src/{mypackage => ebd_toolchain}/mymodule.py (100%) rename src/{mypackage => ebd_toolchain}/py.typed (100%) diff --git a/src/mypackage/__init__.py b/src/ebd_toolchain/__init__.py similarity index 100% rename from src/mypackage/__init__.py rename to src/ebd_toolchain/__init__.py diff --git a/src/mypackage/mymodule.py b/src/ebd_toolchain/mymodule.py similarity index 100% rename from src/mypackage/mymodule.py rename to src/ebd_toolchain/mymodule.py diff --git a/src/mypackage/py.typed b/src/ebd_toolchain/py.typed similarity index 100% rename from src/mypackage/py.typed rename to src/ebd_toolchain/py.typed diff --git a/tox.ini b/tox.ini index 7578ae1..22ce83a 100644 --- 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 index 768a9e4..465bda0 100644 --- 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: From 061090e9c05a75af1f6a3f72f3eca89a9d2ce385 Mon Sep 17 00:00:00 2001 From: konstantin Date: Thu, 2 May 2024 09:22:07 +0200 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=94=A5=20CodeQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/codeql-analysis.yml | 70 --------------------------- 1 file changed, 70 deletions(-) delete mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index 27e6afb..0000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,70 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [main] - pull_request: - # The branches below must be a subset of the branches above - branches: [main] - schedule: - - cron: "29 14 * * 6" - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: ["python"] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] - # Learn more about CodeQL language support at https://git.io/codeql-language-support - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v3 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v3 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 From e3296a315e22eb963343a519776e71179ae42760 Mon Sep 17 00:00:00 2001 From: konstantin Date: Thu, 2 May 2024 09:23:22 +0200 Subject: [PATCH 4/4] align versions --- dev_requirements/requirements-coverage.txt | 2 +- dev_requirements/requirements-formatting.txt | 8 +-- dev_requirements/requirements-linting.txt | 2 +- dev_requirements/requirements-packaging.txt | 51 +++++++++++--------- dev_requirements/requirements-tests.txt | 4 +- dev_requirements/requirements-type_check.txt | 4 +- 6 files changed, 39 insertions(+), 32 deletions(-) diff --git a/dev_requirements/requirements-coverage.txt b/dev_requirements/requirements-coverage.txt index bc12faf..6b5b0b1 100644 --- 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 index 2e04017..1e8089f 100644 --- 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 index 600186a..1214645 100644 --- 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 index 9fdadc4..70816fe 100644 --- 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 index 93567b3..f0f9816 100644 --- a/dev_requirements/requirements-tests.txt +++ b/dev_requirements/requirements-tests.txt @@ -5,6 +5,8 @@ # # pip-compile-multi # +colorama==0.4.6 + # via pytest iniconfig==2.0.0 # via pytest packaging==24.0 @@ -12,4 +14,4 @@ packaging==24.0 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 index 3f275a5..dac66b5 100644 --- 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