diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 177f5e8..a334695 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,6 +28,7 @@ concurrency: env: # Common versions PYTHON_VERSION: '3.11.5' + HATCH_VERSION: '1.12.0' # The PyPi project version to push. The default is v0.0.0+gitdate-gitsha. PYPI_VERSION: ${{ inputs.version }} @@ -45,7 +46,7 @@ jobs: python-version: ${{ env.PYTHON_VERSION }} - name: Setup Hatch - run: pipx install hatch==1.7.0 + run: pipx install hatch==${{ env.HATCH_VERSION }} - name: Lint run: hatch run lint:check @@ -62,10 +63,10 @@ jobs: python-version: ${{ env.PYTHON_VERSION }} - name: Setup Hatch - run: pipx install hatch==1.7.0 + run: pipx install hatch==${{ env.HATCH_VERSION }} - name: Run Unit Tests - run: hatch run test:unit + run: hatch test --all --randomize build: @@ -80,7 +81,7 @@ jobs: python-version: ${{ env.PYTHON_VERSION }} - name: Setup Hatch - run: pipx install hatch==1.7.0 + run: pipx install hatch==${{ env.HATCH_VERSION }} # If a version wasn't explicitly passed as a workflow_dispatch input we # default to version v0.0.0+-, for example @@ -143,7 +144,7 @@ jobs: python-version: ${{ env.PYTHON_VERSION }} - name: Setup Hatch - run: pipx install hatch==1.7.0 + run: pipx install hatch==${{ env.HATCH_VERSION }} - name: Build Documentation run: hatch run docs:pdoc -d google crossplane/function -o docs diff --git a/README.md b/README.md index ad1f88e..d20d968 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ hatch run generate:protoc hatch run lint:check # Run unit tests. -hatch run test:unit +hatch test # Build an sdist and wheel. hatch build diff --git a/pyproject.toml b/pyproject.toml index 08a6eb3..54346d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,14 +58,6 @@ dependencies = ["ruff==0.6.9"] [tool.hatch.envs.lint.scripts] check = "ruff format crossplane tests && ruff check --fix crossplane tests" - -[tool.hatch.envs.test] -type = "virtual" -path = ".venv-test" - -[tool.hatch.envs.test.scripts] -unit = "python -m unittest tests/*.py" - [tool.hatch.envs.docs] type = "virtual" path = ".venv-docs" diff --git a/tests/test_resource.py b/tests/test_resource.py index 47fb18b..e9c818f 100644 --- a/tests/test_resource.py +++ b/tests/test_resource.py @@ -22,8 +22,7 @@ from google.protobuf import struct_pb2 as structpb import crossplane.function.proto.v1.run_function_pb2 as fnv1 from crossplane.function import logging, resource - -from .testdata.models.io.upbound.aws.s3 import v1beta2 +from tests.testdata.models.io.upbound.aws.s3 import v1beta2 class TestResource(unittest.TestCase):