Skip to content

Commit

Permalink
Merge pull request #53 from DSD-DBS/build_cleanup
Browse files Browse the repository at this point in the history
Build cleanup
  • Loading branch information
unexcellent authored Oct 21, 2024
2 parents 5cb6939 + d0a2c50 commit 3b76c79
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 32 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/build-test-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
- "3.12"
- "3.13"
include:
- os: windows-latest
python_version: "3.8"
python_version: "3.13"
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{matrix.python_version}}
Expand Down Expand Up @@ -53,11 +55,11 @@ jobs:
runs-on: ubuntu-latest
needs: test
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: "3.8"
python-version: "3.12"
- name: Install dependencies
run: |-
python -m pip install -U pip
Expand All @@ -69,7 +71,7 @@ jobs:
run: |-
python -m twine check dist/*
- name: Upload artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Artifacts
path: 'dist/*'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: "3.8"
- name: Upgrade pip
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: "3.8"
python-version: "3.12"
- name: Upgrade pip
run: |-
python -m pip install -U pip
Expand All @@ -27,10 +27,10 @@ jobs:
pylint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: "3.8"
python-version: "3.12"
- name: Upgrade pip
run: |-
python -m pip install -U pip
Expand Down
18 changes: 6 additions & 12 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ default_install_hook_types: [commit-msg, pre-commit]
default_stages: [commit, merge-commit]
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-ast
Expand All @@ -26,28 +26,22 @@ repos:
- id: fix-byte-order-marker
- id: trailing-whitespace
- repo: https://github.com/psf/black
rev: 22.3.0
rev: 24.10.0
hooks:
- id: black
- repo: https://github.com/PyCQA/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort
- repo: https://github.com/PyCQA/docformatter
rev: v1.5.0
hooks:
- id: docformatter
additional_dependencies:
- docformatter[tomli]
- repo: https://github.com/PyCQA/pydocstyle
rev: 6.1.1
rev: 6.3.0
hooks:
- id: pydocstyle
exclude: '^tests/'
additional_dependencies:
- pydocstyle[toml]
- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.1.13
rev: v1.5.5
hooks:
- id: insert-license
name: Insert license headers (shell-style comments)
Expand Down Expand Up @@ -90,7 +84,7 @@ repos:
- --comment-style
- '..| |'
- repo: https://github.com/fsfe/reuse-tool
rev: v1.0.0
rev: v4.0.3
hooks:
- id: reuse
- repo: https://github.com/qoomon/git-conventional-commits
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,12 @@ Release
## 3.1.0
- ```LoaderUnderstandAi``` now includes warnings for duplicate annotation id and duplicate frame id
- ```LoaderRaillabel``` now includes a warniing for duplicate frame id

## 3.2.0
- Introduce support for Python 3.12

### 3.2.1
- Fix bug related to Python 3.12

## 3.3.0
- Introduce support for Python 3.13
9 changes: 5 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dynamic = ["version"]
name = "raillabel"
description = "A devkit for working with recorded and annotated train ride data from Deutsche Bahn."
readme = "README.md"
requires-python = ">=3.8, <3.13"
requires-python = ">=3.8, <3.14"
license = { text = "Apache-2.0" }
authors = [
{ name = "DB InfraGO AG" },
Expand All @@ -32,6 +32,7 @@ classifiers = [
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
]
dependencies = [
"jsonschema>=4.4.0",
Expand All @@ -58,7 +59,7 @@ test = [

[tool.black]
line-length = 100
target-version = ["py38"]
target-version = ["py312"]
force-exclude = "tests/"

[tool.docformatter]
Expand All @@ -75,7 +76,7 @@ no_implicit_optional = true
show_error_codes = true
warn_redundant_casts = true
warn_unreachable = true
python_version = "3.8"
python_version = "3.12"

[[tool.mypy.overrides]]
module = ["tests.*"]
Expand Down Expand Up @@ -181,7 +182,7 @@ zip-safe = false
"*" = ["py.typed"]

[tool.setuptools.packages.find]
exclude = ["LICENSES"]
exclude = ["LICENSES", "docs/*", "tests/*"]

[tool.setuptools_scm]
# This section must exist for setuptools_scm to work
2 changes: 1 addition & 1 deletion raillabel/filter/_filter_classes/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# iterate through the modules in the current package
package_dir = str(Path(__file__).resolve().parent)
for (_, module_name, _) in iter_modules([package_dir]):
for _, module_name, _ in iter_modules([package_dir]):

# import the module and iterate through its attributes
module = import_module(f"{__name__}.{module_name}")
Expand Down
2 changes: 1 addition & 1 deletion raillabel/format/raillabel/_object_annotation.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def _collect_annotation_classes():
global ANNOTATION_CLASSES

package_dir = str(Path(__file__).resolve().parent)
for (_, module_name, _) in iter_modules([package_dir]):
for _, module_name, _ in iter_modules([package_dir]):

module = import_module(f"raillabel.format.raillabel.{module_name}")
for attribute_name in dir(module):
Expand Down
2 changes: 1 addition & 1 deletion raillabel/load_/loader_classes/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# iterate through the modules in the current package
package_dir = str(Path(__file__).resolve().parent)
for (_, module_name, _) in iter_modules([package_dir]):
for _, module_name, _ in iter_modules([package_dir]):

# import the module and iterate through its attributes
module = import_module(f"{__name__}.{module_name}")
Expand Down

0 comments on commit 3b76c79

Please sign in to comment.