Skip to content

Commit

Permalink
cleaning version and Aiven-Open
Browse files Browse the repository at this point in the history
  • Loading branch information
jjaakola-aiven committed Sep 13, 2024
1 parent 494c650 commit 4f98e7a
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 16 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
!.git
!karapace
!requirements/*.txt
!version.py
!README.rst
!pyproject.toml
!container/start.sh
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/container-smoke-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

- name: Build karapace/version.py
run: python version.py

- name: Build and start services
run: docker compose --file=container/compose.yml up --build --wait --detach

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ jobs:
python-version: '3.12'
- name: Install libsnappy-dev
run: sudo apt install libsnappy-dev
# required for pylint
- run: make karapace/version.py
- run: pip install pre-commit
- uses: actions/cache@v3
with:
Expand All @@ -47,5 +45,4 @@ jobs:
run: sudo apt install libsnappy-dev
- name: Install requirements and typing requirements
run: pip install -r requirements/requirements.txt -r requirements/requirements-typing.txt
- run: make karapace/version.py
- run: mypy
2 changes: 0 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ jobs:
pattern: coverage-*
merge-multiple: true

- run: make karapace/version.py

- name: Post coverage comment
id: post_coverage_comment
uses: py-cov-action/python-coverage-comment-action@v3
Expand Down
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ To run the tests use the binary `pytest` available in the virtualenv. It will do
used in the tests for you:

```sh
make karapace/version.py
pytest tests/unit
pytest tests/integration
```
Expand Down
9 changes: 3 additions & 6 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,22 @@ venv/.deps: requirements/requirements-dev.txt requirements/requirements.txt | ve
$(PIP) check
touch '$(@)'

karapace/version.py:
$(PYTHON) version.py

.PHONY: version
version: venv/.make | karapace/version.py
version: venv/.make

.PHONY: test
tests: unit-tests integration-tests

.PHONY: unit-tests
unit-tests: export PYTEST_ARGS ?=
unit-tests: karapace/version.py venv/.deps
unit-tests: venv/.deps
rm -fr runtime/*
$(PYTHON) -m pytest -s -vvv $(PYTEST_ARGS) tests/unit/
rm -fr runtime/*

.PHONY: integration-tests
unit-tests: export PYTEST_ARGS ?=
integration-tests: karapace/version.py venv/.deps
integration-tests: venv/.deps
rm -fr runtime/*
$(PYTHON) -m pytest -s -vvv $(PYTEST_ARGS) tests/integration/
rm -fr runtime/*
Expand Down

0 comments on commit 4f98e7a

Please sign in to comment.