From 69db5c591eaee322eecae8561de7c9a5a1fff8ae Mon Sep 17 00:00:00 2001 From: Sebastian Jeltsch Date: Thu, 24 Jul 2025 16:52:07 +0200 Subject: [PATCH] Move python client to /client/python/. --- .github/workflows/test.yml | 2 +- .pre-commit-config.yaml | 6 +++--- Makefile | 4 ++-- client/{trailbase-py => python}/.gitignore | 0 client/{trailbase-py => python}/README.md | 0 client/{trailbase-py => python}/poetry.toml | 0 client/{trailbase-py => python}/pyproject.toml | 0 client/{trailbase-py => python}/tests/__init__.py | 0 client/{trailbase-py => python}/tests/test_client.py | 2 +- client/{trailbase-py => python}/trailbase/__init__.py | 0 docs/examples/record_api_py/poetry.lock | 6 +++--- docs/examples/record_api_py/pyproject.toml | 4 ++-- 12 files changed, 12 insertions(+), 12 deletions(-) rename client/{trailbase-py => python}/.gitignore (100%) rename client/{trailbase-py => python}/README.md (100%) rename client/{trailbase-py => python}/poetry.toml (100%) rename client/{trailbase-py => python}/pyproject.toml (100%) rename client/{trailbase-py => python}/tests/__init__.py (100%) rename client/{trailbase-py => python}/tests/test_client.py (98%) rename client/{trailbase-py => python}/trailbase/__init__.py (100%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cf853625..e170b03b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,7 +43,7 @@ jobs: python-version: '3.13' - name: Poetry install run: | - pipx install poetry && poetry -C client/trailbase-py install + pipx install poetry && poetry -C client/python install # - name: Setup Go # uses: actions/setup-go@v5 # with: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 57097240..0b238969 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -123,21 +123,21 @@ repos: ### Python client - id: python_format name: Python format - entry: poetry -C client/trailbase-py run black --config pyproject.toml --check . + entry: poetry -C client/python run black --config pyproject.toml --check . language: system types: [python] pass_filenames: false - id: python_check name: Python check - entry: poetry -C client/trailbase-py run pyright --outputjson + entry: poetry -C client/python run pyright --outputjson language: system types: [python] pass_filenames: false - id: python_test name: Python test - entry: poetry -C client/trailbase-py run pytest + entry: poetry -C client/python run pytest language: system types: [python] pass_filenames: false diff --git a/Makefile b/Makefile index cd792445..2fa2c04f 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ format: txtpbfmt `find . -regex ".*.textproto" | grep -v config.textproto`; \ dotnet format client/dotnet/trailbase; \ dotnet format client/dotnet/test; \ - poetry -C client/trailbase-py run black --config pyproject.toml .; \ + poetry -C client/python run black --config pyproject.toml .; \ swift format -r -i client/swift/trailbase/**/*.swift; \ gofmt -w **/*.go; @@ -21,7 +21,7 @@ check: dart analyze; \ dotnet format client/dotnet/trailbase --verify-no-changes; \ dotnet format client/dotnet/test --verify-no-changes; \ - poetry -C client/trailbase-py run pyright + poetry -C client/python run pyright docker: docker buildx build --platform linux/arm64,linux/amd64 --output=type=registry -t trailbase/trailbase:latest . diff --git a/client/trailbase-py/.gitignore b/client/python/.gitignore similarity index 100% rename from client/trailbase-py/.gitignore rename to client/python/.gitignore diff --git a/client/trailbase-py/README.md b/client/python/README.md similarity index 100% rename from client/trailbase-py/README.md rename to client/python/README.md diff --git a/client/trailbase-py/poetry.toml b/client/python/poetry.toml similarity index 100% rename from client/trailbase-py/poetry.toml rename to client/python/poetry.toml diff --git a/client/trailbase-py/pyproject.toml b/client/python/pyproject.toml similarity index 100% rename from client/trailbase-py/pyproject.toml rename to client/python/pyproject.toml diff --git a/client/trailbase-py/tests/__init__.py b/client/python/tests/__init__.py similarity index 100% rename from client/trailbase-py/tests/__init__.py rename to client/python/tests/__init__.py diff --git a/client/trailbase-py/tests/test_client.py b/client/python/tests/test_client.py similarity index 98% rename from client/trailbase-py/tests/test_client.py rename to client/python/tests/test_client.py index 089caf81..1809ae81 100644 --- a/client/trailbase-py/tests/test_client.py +++ b/client/python/tests/test_client.py @@ -21,7 +21,7 @@ class TrailBaseFixture: def __init__(self) -> None: cwd = os.getcwd() - traildepot = "../testfixture" if cwd.endswith("trailbase-py") else "client/testfixture" + traildepot = "../testfixture" if cwd.endswith("python") else "client/testfixture" logger.info("Building TrailBase") build = subprocess.run(["cargo", "build"]) diff --git a/client/trailbase-py/trailbase/__init__.py b/client/python/trailbase/__init__.py similarity index 100% rename from client/trailbase-py/trailbase/__init__.py rename to client/python/trailbase/__init__.py diff --git a/docs/examples/record_api_py/poetry.lock b/docs/examples/record_api_py/poetry.lock index e436e961..9642e3ba 100644 --- a/docs/examples/record_api_py/poetry.lock +++ b/docs/examples/record_api_py/poetry.lock @@ -493,7 +493,7 @@ files = [ [[package]] name = "trailbase" -version = "0.3.0" +version = "0.4.0" description = "TrailBase client for Python" optional = false python-versions = "^3.12" @@ -508,7 +508,7 @@ pyjwt = "^2.10.0" [package.source] type = "directory" -url = "../../../client/trailbase-py" +url = "../../../client/python" [[package]] name = "typing-extensions" @@ -526,4 +526,4 @@ markers = {main = "python_version < \"3.13\""} [metadata] lock-version = "2.1" python-versions = "^3.12" -content-hash = "71bb1977fce56458d00419bb62a9112bc8c479d1063c3b835fed7c8092f4737b" +content-hash = "af05be45b5aa841db3cdc0b17d2ae133b40a7fdd1d22bec70244a3420ff40127" diff --git a/docs/examples/record_api_py/pyproject.toml b/docs/examples/record_api_py/pyproject.toml index cd529360..6962ae00 100644 --- a/docs/examples/record_api_py/pyproject.toml +++ b/docs/examples/record_api_py/pyproject.toml @@ -10,7 +10,7 @@ requires-python = "^3.12" requires-poetry = "^2.0" [tool.poetry.dependencies] -trailbase = { path = "../../../client/trailbase-py" } +trailbase = { path = "../../../client/python" } [tool.poetry.group.dev.dependencies] black = "^24.10.0" @@ -31,4 +31,4 @@ typeCheckingMode = "strict" useLibraryCodeForTypes = true verboseOutput = true reportMissingTypeStubs = "warning" -extraPaths = ["../../../client/trailbase-py/"] +extraPaths = ["../../../client/python/"]