Skip to content

Commit

Permalink
Merge pull request #5 from bytewax/hashable_url
Browse files Browse the repository at this point in the history
Pin uv in CI, use hashable URL for autodoc2
  • Loading branch information
whoahbot authored Aug 28, 2024
2 parents 28e0722 + cd48a7f commit 3683821
Show file tree
Hide file tree
Showing 5 changed files with 315 additions and 47 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: 3.12
- name: Install uv
run: pipx install uv
- name: Set up uv
run: curl -LsSf https://astral.sh/uv/0.3.5/install.sh | sh
- uses: extractions/setup-just@v2
- name: Install cbfmt
run: |
Expand Down Expand Up @@ -68,8 +68,8 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install uv
run: pipx install uv
- name: Set up uv
run: curl -LsSf https://astral.sh/uv/0.3.5/install.sh | sh
- uses: extractions/setup-just@v2
- name: Prep test venv
shell: bash
Expand Down Expand Up @@ -108,8 +108,8 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install uv
run: pipx install uv
- name: Set up uv
run: curl -LsSf https://astral.sh/uv/0.3.5/install.sh | sh
- uses: extractions/setup-just@v2
- name: Prep test venv
shell: bash
Expand Down
3 changes: 1 addition & 2 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@ venv-sync-all: (venv-sync "doc") (venv-sync "dev")

# Pin / compile all dependences for reproducible venvs; re-run this if you update any library deps or `.in` files
venv-compile-all:
# TODO: Disabling the generation of hashes for docs until we don't depend on a VCS url for autodoc2
uv pip compile -p 3.12 requirements/doc.in -o requirements/doc.txt
uv pip compile --generate-hashes -p 3.12 requirements/doc.in -o requirements/doc.txt

uv pip compile --generate-hashes -p 3.8 --all-extras pyproject.toml -o requirements/lib-py3.8.txt
uv pip compile --generate-hashes -p 3.9 --all-extras pyproject.toml -o requirements/lib-py3.9.txt
Expand Down
3 changes: 2 additions & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,8 @@ sphinx==8.0.2 \
sphinx-autobuild==2024.4.16 \
--hash=sha256:1c0ed37a1970eed197f9c5a66d65759e7c4e4cba7b5a5d77940752bf1a59f2c7 \
--hash=sha256:f2522779d30fcbf0253e09714f274ce8c608cb6ebcd67922b1c54de59faba702
sphinx-autodoc2 @ git+https://github.com/davidselassie/sphinx-autodoc2@a9db7460ca254983c673184f1d7b5db6c1c31e83
sphinx-autodoc2 @ https://github.com/davidselassie/sphinx-autodoc2/archive/namespace-packages.zip \
--hash=sha256:4155079fe985398dd1cb1789619a485c735a46ca4570bf13b0be0584fc966615
sphinx-favicon==1.0.1 \
--hash=sha256:7c93d6b634cb4c9687ceab67a8526f05d3b02679df94e273e51a43282e6b034c \
--hash=sha256:df796de32125609c1b4a8964db74270ebf4502089c27cd53f542354dc0b57e8e
Expand Down
2 changes: 1 addition & 1 deletion requirements/doc.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
myst-parser
pydata-sphinx-theme
sphinx
sphinx-autodoc2 @ git+https://github.com/davidselassie/sphinx-autodoc2@namespace-packages
sphinx-autodoc2 @ https://github.com/davidselassie/sphinx-autodoc2/archive/namespace-packages.zip
sphinx-favicon
sphinx-substitution-extensions
sphinxcontrib-mermaid
Loading

0 comments on commit 3683821

Please sign in to comment.