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

Fix CLI docs action #730

Merged
merged 43 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
3229a09
try change in ubuntu version
i-oden Dec 17, 2024
4f2af64
pullreq
i-oden Dec 17, 2024
28f98c4
chechout version
i-oden Dec 17, 2024
6a1142e
ubuntu
i-oden Dec 17, 2024
5cd0b8e
test zstandard
i-oden Dec 17, 2024
ee3ce64
revert zstandard
i-oden Dec 17, 2024
b2660be
attempt to use 3.12 python
i-oden Dec 18, 2024
037981b
change back to matthiaszepper
i-oden Dec 18, 2024
256298c
try again
i-oden Dec 18, 2024
e13bc1f
3.12 wasn't a string
i-oden Dec 18, 2024
c9ae5ac
name added?
i-oden Dec 18, 2024
788ec08
still not a string
i-oden Dec 18, 2024
38d6e25
don't have string
i-oden Dec 18, 2024
9b45876
forgot latest
i-oden Dec 18, 2024
d894ab6
specify version of python in html docs build
i-oden Dec 18, 2024
65cd5a2
test ubuntu
i-oden Dec 18, 2024
c7517f1
comment out container
i-oden Dec 18, 2024
9c7ee2c
v1 action
i-oden Dec 18, 2024
8af054e
libffi-dev
i-oden Dec 18, 2024
474ad9d
revert
i-oden Dec 18, 2024
63f1fc4
bump sphinx
i-oden Dec 19, 2024
8c4aa06
undo sphinx and bump zstandard
i-oden Dec 19, 2024
a4a657b
bump checout action
i-oden Dec 19, 2024
36ad6aa
bump sphinx to 5.1.0
i-oden Dec 19, 2024
6180e5f
bump sphinx and rtd theme again
i-oden Dec 19, 2024
4e5e223
bump sphinx click etc as well
i-oden Dec 19, 2024
16d676e
main
i-oden Dec 19, 2024
bf2825b
remove title
i-oden Dec 19, 2024
2d55f66
undo changes
i-oden Dec 19, 2024
c2dca2d
bump to sphinx 6.2.0
i-oden Dec 19, 2024
2a89302
bump sphinx-rtd-theme
i-oden Dec 19, 2024
d8ee3bd
sphinx click ext to just sphinx click
i-oden Dec 19, 2024
0261952
force python 3.12
i-oden Dec 19, 2024
f1c27fa
revert versions
i-oden Dec 19, 2024
43ed351
imghdr
i-oden Dec 19, 2024
226a41c
ext on click
i-oden Dec 19, 2024
4266ede
cgi
i-oden Dec 19, 2024
f14d0d6
prettier
i-oden Dec 19, 2024
ae8406c
zstandard
i-oden Dec 19, 2024
19efd49
zstandard
i-oden Dec 19, 2024
e9ca4ee
don't specify python 3.12
i-oden Dec 19, 2024
09050cc
don't push on PR
i-oden Dec 19, 2024
a5aba24
sprintlog
i-oden Dec 19, 2024
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
3 changes: 2 additions & 1 deletion .github/workflows/docs-github-pages-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ jobs:
name: Build the DDS CLI Documentation
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Make dependencies available to Docker container
run: |
cat requirements.txt requirements-dev.txt > ./docs/requirements.txt
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
name: Check out source-code repository

- name: Set up Python 3.12
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
OUT_FILE_NAME: dds_cli_ubuntu-latest_x86_64
ASSET_MIME: application/x-elf
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Python 3.9 setup
uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
needs: build-n-publish
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Make dependencies available to Docker container
run: |
cat requirements.txt requirements-dev.txt > ./docs/requirements.txt
Expand Down
1 change: 1 addition & 0 deletions SPRINTLOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -397,3 +397,4 @@ _Empty sprint_
# 2024-12-16 - 2024-12-20

- New version: 2.9.0 ([#728](https://github.com/ScilifelabDataCentre/dds_cli/pull/728))
- Include legacy packages (removed in Python 3.13) in development requirements to fix documentation on GitHub Pages ([#730](https://github.com/ScilifelabDataCentre/dds_cli/pull/730))
4 changes: 3 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ sphinx-click==4.0.0
pyinstaller # version not pinned due to latest used by release procedure
pylint==2.17.3
sphinx-copybutton==0.5.1
sphinxcontrib-svg2pdfconverter==1.2.2
sphinxcontrib-svg2pdfconverter==1.2.2
standard-imghdr==3.13.0 # removed in python 3.13, needed for sphinx (until more stable fix)
legacy-cgi==2.6.1 # removed in python 3.13, needed for sphinx (until more stable fix)
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ rich==13.6.0
rich-click==1.5.2
simplejson==3.17.6
tzlocal==4.2
zstandard==0.22.0
zstandard==0.23.0
Loading