Skip to content

Commit f9ed2d0

Browse files
committed
Merge branch 'FSTORE-1346' into FSTORE-1371
2 parents ed97bb3 + 7f8c718 commit f9ed2d0

File tree

5 files changed

+18
-23
lines changed

5 files changed

+18
-23
lines changed

.github/workflows/mkdocs-main.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ jobs:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v4
1111
with:
1212
fetch-depth: 0
1313

1414
- name: set dev version
1515
working-directory: ./java
1616
run: echo "DEV_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev 'Download|INFO|WARNING')" >> $GITHUB_ENV
1717

18-
- uses: actions/setup-python@v2
18+
- uses: actions/setup-python@v5
1919
with:
20-
python-version: '3.8'
20+
python-version: "3.10"
2121

2222
- name: install deps
2323
working-directory: ./python
@@ -33,4 +33,3 @@ jobs:
3333
3434
- name: mike deploy docs
3535
run: mike deploy ${{ env.DEV_VERSION }} dev -u
36-

.github/workflows/mkdocs-release.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ name: mkdocs-release
22

33
on:
44
push:
5-
branches: [ branch-* ]
5+
branches: [branch-*]
66

77
jobs:
88
publish-release:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313
with:
1414
fetch-depth: 0
1515

@@ -20,16 +20,13 @@ jobs:
2020
- name: set major/minor release version
2121
run: echo "MAJOR_VERSION=$(echo $RELEASE_VERSION | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/')" >> $GITHUB_ENV
2222

23-
- uses: actions/setup-python@v2
23+
- uses: actions/setup-python@v5
2424
with:
25-
python-version: '3.8'
25+
python-version: "3.10"
2626

2727
- name: install deps
2828
working-directory: ./python
29-
run: cp ../README.md . && pip3 install pip==22.0.3 && pip3 install -e .[dev,docs]
30-
31-
- name: use dev mike
32-
run: pip3 uninstall -y mike && pip3 install git+'https://github.com/jimporter/mike.git'
29+
run: cp ../README.md . && pip3 install -e .[dev,docs]
3330

3431
- name: generate autodoc
3532
run: python3 auto_doc.py
@@ -43,4 +40,3 @@ jobs:
4340
run: |
4441
mike deploy ${{ env.RELEASE_VERSION }} ${{ env.MAJOR_VERSION }} -u --push
4542
mike alias ${{ env.RELEASE_VERSION }} latest -u --push
46-

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ We use `mkdocs` together with `mike` ([for versioning](https://github.com/jimpor
7474
1. Currently we are using our own version of `keras-autodoc`
7575

7676
```bash
77-
pip install git+https://github.com/moritzmeister/keras-autodoc@split-tags-properties
77+
pip install git+https://github.com/logicalclocks/keras-autodoc
7878
```
7979

8080
2. Install HOPSWORKS with `docs` extras:

docs/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ We use `mkdocs` together with `mike` ([for versioning](https://github.com/jimpor
7474
1. Currently we are using our own version of `keras-autodoc`
7575

7676
```bash
77-
pip install git+https://github.com/moritzmeister/keras-autodoc@split-tags-properties
77+
pip install git+https://github.com/logicalclocks/keras-autodoc
7878
```
7979

8080
2. Install HOPSWORKS with `docs` extras:

python/setup.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ def read(fname):
3131
extras_require={
3232
"dev": ["pytest", "flake8", "black"],
3333
"docs": [
34-
"mkdocs==1.3.0",
35-
"mkdocs-material==8.2.8",
36-
"mike==1.1.2",
37-
"sphinx==3.5.4",
38-
"keras_autodoc @ git+https://git@github.com/moritzmeister/keras-autodoc@split-tags-properties",
39-
"markdown-include",
40-
"markdown==3.3.7",
41-
"pymdown-extensions",
34+
"mkdocs==1.5.3",
35+
"mkdocs-material==9.5.17",
36+
"mike==2.0.0",
37+
"sphinx==7.2.6",
38+
"keras_autodoc @ git+https://git@github.com/logicalclocks/keras-autodoc",
39+
"markdown-include==0.8.1",
40+
"markdown==3.6",
41+
"pymdown-extensions==10.7.1",
4242
],
4343
},
4444
author="Logical Clocks AB",

0 commit comments

Comments
 (0)