Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Install uv
uses: astral-sh/setup-uv@v5
uses: astral-sh/setup-uv@v6
- name: Build ${{ matrix.component }}
run: |
if [ "${{ matrix.component }}" = "gooddata-api-client" ]; then
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/bump-version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
token: ${{ secrets.TOKEN_GITHUB_YENKINS_ADMIN }} # needed to push to the protected branch

- name: Install uv
uses: astral-sh/setup-uv@v5
uses: astral-sh/setup-uv@v6

- name: Install dependencies
run: |
Expand All @@ -39,12 +39,12 @@ jobs:
- name: Bump version
id: bump
run: |
NEW_VERSION=$(python ./scripts/bump_version.py ${{ github.event.inputs.bump_type }})
NEW_VERSION=$(uv run python ./scripts/bump_version.py ${{ github.event.inputs.bump_type }})
echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT

- name: Bump version in documentation
run: |
python scripts/bump_doc_dependencies.py ${{ steps.bump.outputs.new_version }}
uv run python ./scripts/bump_doc_dependencies.py ${{ steps.bump.outputs.new_version }}

- name: Bump version in codebase
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ jobs:
with:
ref: ${{ inputs.BRANCH_NAME }}
- name: Install uv
uses: astral-sh/setup-uv@v5
uses: astral-sh/setup-uv@v6
- name: Install dependencies
run: |
uv sync --group release
- name: Bump to dev
run: tbump --only-patch --non-interactive $(./scripts/next_dev.sh)
run: uv run tbump --only-patch --non-interactive $(./scripts/next_dev.sh)
- name: Build ${{ matrix.component }}
run: |
if [ "${{ matrix.component }}" = "gooddata-api-client" ]; then
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/rw-python-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ jobs:
python-version: 3.13
- name: Install dependencies
run: |
uv venv
uv pip install --group lint
uv sync --group lint
- name: pep8 and formatting check
run: |
make format
Expand All @@ -49,13 +48,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Set up python 3.13
uses: actions/setup-python@v5
with:
python-version-file: '.python-version'
uses: astral-sh/setup-uv@v6
- name: Install dependencies
run: |
python -m pip install uv
uv pip install --group tox --group type --system
uv sync --group tox --group type
- name: mypy check
run: |
make mypy
4 changes: 4 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,7 @@ repos:
rev: v0.19.1
hooks:
- id: gitlint
- repo: https://github.com/astral-sh/uv-pre-commit
rev: 0.9.5
hooks:
- id: uv-lock
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ RUN set -x \
&& true

# install tox
ENV PYTHON_TOX_VERSION=4.14.1
ENV PYTHON_TOX_UV_VERSION=1.7.0
ENV PYTHON_TOX_VERSION=4.30.0
ENV PYTHON_TOX_UV_VERSION=1.28.0
RUN set -x \
&& pip3 install uv tox==${PYTHON_TOX_VERSION} tox-uv==${PYTHON_TOX_UV_VERSION}\
&& true
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,16 @@ test:
.PHONY: release
release:
if [ -z "$(VERSION)" ]; then echo "Usage: 'make release VERSION=X.Y.Z'"; false; else \
tbump $(VERSION) --no-tag --no-push ; fi
uv run tbump $(VERSION) --no-tag --no-push ; fi

.PHONY: release-ci
release-ci:
if [ -z "$(VERSION)" ]; then echo "Usage: 'make release-ci VERSION=X.Y.Z'"; false; else \
tbump $(VERSION) --only-patch --non-interactive ; fi
uv run tbump $(VERSION) --only-patch --non-interactive ; fi

.PHONY: check-copyright
check-copyright:
./scripts/check_copyright.py FOLDER
uv run ./scripts/check_copyright.py FOLDER

.PHONY: docs
docs:
Expand Down
4 changes: 2 additions & 2 deletions project_common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ format-fix:

.PHONY: mypy
mypy:
tox $(TOX_FLAGS) -e mypy
uv run tox $(TOX_FLAGS) -e mypy

.PHONY: test
test:
tox -v $(TOX_FLAGS) $(LOCAL_TEST_ENVS) $(LOCAL_ADD_ARGS)
uv run tox -v $(TOX_FLAGS) $(LOCAL_TEST_ENVS) $(LOCAL_ADD_ARGS)

.PHONY: test-ci
test-ci:
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ release = [
"tomlkit>=0.11"
]
tox = [
"tox~=4.26.0",
"tox-uv~=1.26.1"
"tox~=4.30.0",
"tox-uv~=1.28.0"
]

[tool.ruff]
Expand Down
209 changes: 150 additions & 59 deletions uv.lock

Large diffs are not rendered by default.

Loading