Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vendor webassets code #16

Merged
merged 23 commits into from
Nov 3, 2024
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
78 changes: 31 additions & 47 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,68 +5,58 @@ on: [push, pull_request]
env:
PYTEST_ADDOPTS: "--color=yes"

jobs:
permissions:
contents: read

jobs:
test:
name: Test - ${{ matrix.python-version }}
name: Test - Python ${{ matrix.python-version }}
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3

- name: Install Poetry
run: pipx install poetry

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
- uses: actions/checkout@v4
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
cache-dependency-path: "pyproject.toml"
persist-credentials: false
- name: Install uv
uses: astral-sh/setup-uv@v3

- name: Install dependencies
env:
UV_PYTHON: "python${{ matrix.python-version }}"
run: |
poetry env use "${{ matrix.python-version }}"
poetry run pip install --upgrade libsass
poetry install --no-interaction
uv sync --frozen --no-sources

- name: Run tests
run: poetry run invoke tests

run: uv run invoke tests

lint:
name: Lint
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false

- name: Validate links in Markdown files
uses: JustinBeckwith/linkinator-action@v1
with:
retry: true

- name: Install Poetry
run: pipx install poetry

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.9"
cache: "poetry"
cache-dependency-path: "pyproject.toml"
- name: Install uv
uses: astral-sh/setup-uv@v3

- name: Install dependencies
env:
UV_PYTHON: "python3.10"
run: |
poetry env use "3.9"
poetry install --no-interaction
uv sync --frozen --no-sources
offbyone marked this conversation as resolved.
Show resolved Hide resolved

- name: Run linters
run: poetry run invoke lint --diff

run: uv run invoke lint --diff

deploy:
name: Deploy
Expand All @@ -80,31 +70,25 @@ jobs:
id-token: write

steps:
- uses: actions/checkout@v3
with:
token: ${{ secrets.GH_TOKEN }}
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.9"
- name: Install uv
uses: astral-sh/setup-uv@v3

- name: Check release
id: check_release
run: |
python -m pip install --upgrade pip
python -m pip install autopub[github]
autopub check
uvx --with 'autopub[github]' autopub check

- name: Publish
if: ${{ steps.check_release.outputs.autopub_release=='true' }}
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
autopub prepare
autopub commit
autopub build
autopub githubrelease
uvx --with 'autopub[github]' autopub prepare
uvx --with 'autopub[github]' autopub commit
uvx --with 'autopub[github]' autopub build
uvx --with 'autopub[github]' autopub githubrelease
justinmayer marked this conversation as resolved.
Show resolved Hide resolved

- name: Upload package to PyPI
if: ${{ steps.check_release.outputs.autopub_release=='true' }}
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
poetry.lock
uv.lock
21 changes: 6 additions & 15 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ci:
# See https://pre-commit.com/hooks.html for info on hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-ast
Expand All @@ -20,18 +20,9 @@ repos:
- id: forbid-new-submodules
- id: trailing-whitespace

- repo: https://github.com/psf/black
rev: 23.3.0
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.7.1
hooks:
- id: black

- repo: https://github.com/PyCQA/flake8
rev: 3.9.2
hooks:
- id: flake8
args: [--max-line-length=88]

- repo: https://github.com/PyCQA/isort
rev: 5.11.5
hooks:
- id: isort
- id: ruff
- id: ruff-format
args: ["--check"]
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

[![Build Status](https://img.shields.io/github/actions/workflow/status/pelican-plugins/webassets/main.yml?branch=main)](https://github.com/pelican-plugins/webassets/actions)
[![PyPI Version](https://img.shields.io/pypi/v/pelican-webassets)](https://pypi.org/project/pelican-webassets/)
[![Downloads](https://img.shields.io/pypi/dm/pelican-webassets)](https://pypi.org/project/pelican-webassets/)
![License](https://img.shields.io/pypi/l/pelican-webassets?color=blue)

This [Pelican](https://github.com/getpelican/pelican) plugin allows you to use
Expand Down
Loading
Loading