Skip to content

Commit

Permalink
ci: minor tweaks and fixes (#2768)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelotduarte authored Jan 7, 2025
1 parent 8e019cc commit aee3a1a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,7 @@ jobs:

- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
sudo apt-get install -qy alien fakeroot rpm
sudo apt-get install -qy --allow-downgrades cpio=2.13+dfsg-7 || true
run: sudo apt-get install -qy alien fakeroot rpm

- name: Install dependencies to test
run: |
Expand Down
10 changes: 4 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,10 @@ ifeq ($(PY_PLATFORM),win-amd64)
fi
else
curl -LsSf https://astral.sh/uv/install.sh | \
env UV_INSTALL_DIR=="$(HOME)/bin" INSTALLER_NO_MODIFY_PATH=1 sh
env UV_INSTALL_DIR="$(HOME)/bin" INSTALLER_NO_MODIFY_PATH=1 sh
endif
if ! which pre-commit || ! [ -f .git/hooks/pre-commit ]; then\
uv pip install --upgrade \
-r requirements.txt -r requirements-dev.txt -r doc/requirements.txt &&\
uv pip install -e. --no-build-isolation --no-deps --reinstall &&\
uv sync --extra dev --extra doc --upgrade &&\
pre-commit install --install-hooks --overwrite -t pre-commit;\
fi

Expand All @@ -59,7 +57,7 @@ html:
pre-commit run blacken-docs $(PRE_COMMIT_OPTIONS);\
pre-commit run build-docs $(PRE_COMMIT_OPTIONS);\
else\
uv pip install --upgrade -r doc/requirements.txt &&\
uv sync --no-install-project --extra doc --upgrade && \
$(MAKE) -C doc html;\
fi

Expand All @@ -74,8 +72,8 @@ doc: html

.PHONY: install_pytest
install_pytest:
uv sync --no-install-project --extra tests --upgrade
./ci/build-wheel.sh
uv pip install --upgrade -r tests/requirements.txt

.PHONY: tests
tests: install_pytest
Expand Down

0 comments on commit aee3a1a

Please sign in to comment.