Skip to content

Commit

Permalink
Switch from Poetry to uv
Browse files Browse the repository at this point in the history
  • Loading branch information
kdeldycke committed Jul 10, 2024
1 parent 342fd17 commit 1d6710c
Show file tree
Hide file tree
Showing 33 changed files with 1,090 additions and 1,692 deletions.
22 changes: 14 additions & 8 deletions .github/workflows/autofix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Autofix
jobs:

autofix:
uses: kdeldycke/workflows/.github/workflows/autofix.yaml@v3.4.7
uses: kdeldycke/workflows/.github/workflows/autofix.yaml@v4.1.4
with:
gitignore-extra-categories: node

Expand All @@ -22,16 +22,19 @@ jobs:
- uses: actions/setup-python@v5.1.0
with:
python-version: "3.12"
- name: Install uv
run: |
python -m pip install -r https://raw.githubusercontent.com/kdeldycke/workflows/v4.1.4/requirements/uv.txt
- name: Install Pygments
run: |
python -m pip install --upgrade pip poetry
poetry install
uv venv --system
uv pip install .
- name: Generate Pygments styles
run: |
for STYLE in $(poetry run pygmentize -L styles | grep -E '^\* .*\:$' | cut -d ' ' -f 2 | cut -d ':' -f 1);
for STYLE in $(uv run pygmentize -L styles | grep -E '^\* .*\:$' | cut -d ' ' -f 2 | cut -d ':' -f 1);
do
CSS_FILE="./plumage/static/css/pygments/$STYLE.css"
poetry run pygmentize -f html -S "$STYLE" -a ".pygments-style-$STYLE" > "$CSS_FILE"
uv run pygmentize -f html -S "$STYLE" -a ".pygments-style-$STYLE" > "$CSS_FILE"
# Crappy split of side-by-side declarations to please styleint.
sed -i "s/; /; \n/g" "$CSS_FILE"
done
Expand Down Expand Up @@ -84,13 +87,16 @@ jobs:
- uses: actions/setup-python@v5.1.0
with:
python-version: "3.12"
- name: Install uv
run: |
python -m pip install -r https://raw.githubusercontent.com/kdeldycke/workflows/v4.1.4/requirements/uv.txt
- name: Install djlint
run: |
python -m pip install --upgrade pip poetry
poetry install
uv venv --system
uv pip install ".[test]"
- name: Autofix Jinja
run: >
poetry run djlint
uv run djlint
--reformat
--profile jinja
--format-css
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/autolock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ name: Autolock
jobs:

autolock:
uses: kdeldycke/workflows/.github/workflows/autolock.yaml@v3.4.7
uses: kdeldycke/workflows/.github/workflows/autolock.yaml@v4.1.4
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ name: Changelog & versions
jobs:

changelog:
uses: kdeldycke/workflows/.github/workflows/changelog.yaml@v3.4.7
uses: kdeldycke/workflows/.github/workflows/changelog.yaml@v4.1.4
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ name: Docs
jobs:

docs:
uses: kdeldycke/workflows/.github/workflows/docs.yaml@v3.4.7
uses: kdeldycke/workflows/.github/workflows/docs.yaml@v4.1.4
2 changes: 1 addition & 1 deletion .github/workflows/label-sponsors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ name: Label sponsors
jobs:

label-sponsors:
uses: kdeldycke/workflows/.github/workflows/label-sponsors.yaml@v3.4.7
uses: kdeldycke/workflows/.github/workflows/label-sponsors.yaml@v4.1.4
2 changes: 1 addition & 1 deletion .github/workflows/labeller-file-based.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ name: Labeller (file-based)
jobs:

labeller:
uses: kdeldycke/workflows/.github/workflows/labeller-file-based.yaml@v3.4.7
uses: kdeldycke/workflows/.github/workflows/labeller-file-based.yaml@v4.1.4
2 changes: 1 addition & 1 deletion .github/workflows/labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ name: Labels
jobs:

labels:
uses: kdeldycke/workflows/.github/workflows/labels.yaml@v3.4.7
uses: kdeldycke/workflows/.github/workflows/labels.yaml@v4.1.4
11 changes: 7 additions & 4 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: Lint
jobs:

lint:
uses: kdeldycke/workflows/.github/workflows/lint.yaml@v3.4.7
uses: kdeldycke/workflows/.github/workflows/lint.yaml@v4.1.4

lint-jinja:
name: Lint Jinja
Expand All @@ -19,13 +19,16 @@ jobs:
- uses: actions/setup-python@v5.1.0
with:
python-version: "3.12"
- name: Install uv
run: |
python -m pip install -r https://raw.githubusercontent.com/kdeldycke/workflows/v4.1.4/requirements/uv.txt
- name: Install djlint
run: |
python -m pip install --upgrade pip poetry
poetry install
uv venv --system
uv pip install ".[test]"
- name: Autofix Jinja
run: >
poetry run djlint --lint --profile jinja plumage/templates/*.html
uv run djlint --lint --profile jinja plumage/templates/*.html
lint-css:
name: Lint CSS files
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ name: Build & release
jobs:

release:
uses: kdeldycke/workflows/.github/workflows/release.yaml@v3.4.7
uses: kdeldycke/workflows/.github/workflows/release.yaml@v4.1.4
secrets:
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
2 changes: 2 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
This version is not released yet and is under active development.
```

- Switch from Poetry to `uv`.

## [4.0.0 (2024-05-17)](https://github.com/kdeldycke/plumage/compare/v3.1.0...v4.0.0)

- Replace Font Awesome by Bootstrap Icons.
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Loading

0 comments on commit 1d6710c

Please sign in to comment.