Skip to content

Commit fc0c3e6

Browse files
committed
Fetch the Khiops Python tutorials in the doc building script
To this end, also: - make the Khiops Python tutorial repository reference customizable, so that we can choose which v10 vs v11 tutorial versions to use when building the Python API docs; - clone the Khiops Python tutorial repository via HTTPS in the doc build script, as there is no need for any authentication to clone this.
1 parent 8e41604 commit fc0c3e6

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

.github/workflows/api-docs.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,10 @@ jobs:
4646
# https://github.com/actions/runner/issues/2033#issuecomment-1598547465
4747
options: --user 1001
4848
steps:
49-
- name: Set parameters as env
50-
run: |
51-
KHIOPS_PYTHON_TUTORIAL_REVISION=${{ inputs.khiops-python-tutorial-revision || env.DEFAULT_KHIOPS_PYTHON_TUTORIAL_REVISION }}
52-
echo "KHIOPS_PYTHON_TUTORIAL_REVISION=$KHIOPS_PYTHON_TUTORIAL_REVISION" >> "$GITHUB_ENV"
5349
- name: Checkout khiops-python
5450
uses: actions/checkout@v4
5551
with:
5652
fetch-depth: 0
57-
- name: Checkout khiops-python-tutorial
58-
uses: actions/checkout@v4
59-
with:
60-
repository: khiopsml/khiops-python-tutorial
61-
ref: ${{ env.KHIOPS_PYTHON_TUTORIAL_REVISION }}
62-
path: doc/khiops-python-tutorial
6353
- name: Add pip scripts directory to path
6454
run: echo PATH="$PATH:/github/home/.local/bin" >> "$GITHUB_ENV"
6555
- name: Install doc build requirements
@@ -72,10 +62,12 @@ jobs:
7262
# Install the doc python requirements
7363
cd doc
7464
pip3 install -U -r requirements.txt
65+
# Clone the Khiops Python tutorial repository while building the documentation
7566
- name: Build Sphinx Documentation
7667
run: |
7768
cd doc
78-
./create-doc -t
69+
./create-doc -t -d -g \
70+
${{ inputs.khiops-python-tutorial-revision || env.DEFAULT_KHIOPS_PYTHON_TUTORIAL_REVISION }}
7971
- name: Upload the docs as an artifact
8072
uses: actions/upload-artifact@v4
8173
with:

doc/create-doc

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,20 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
77
# Default parameter values
88
TRANSFORM_NOTEBOOKS=""
99
DOWNLOAD_REPO=""
10-
DEFAULT_KHIOPS_TUTORIAL_REPO_URL="git@github.com:KhiopsML/khiops-python-tutorial.git"
10+
DEFAULT_KHIOPS_TUTORIAL_REPO_URL="https://github.com/KhiopsML/khiops-python-tutorial.git"
11+
DEFAULT_KHIOPS_TUTORIAL_REPO_REF="main"
1112
DEFAULT_KHIOPS_TUTORIAL_DIR="${SCRIPT_DIR}/khiops-python-tutorial"
1213

1314
# Function to display the usage help
1415
usage() {
15-
echo "Usage: create-doc [-r REPO_URL] [-d] [-t] [-l]"
16+
echo "Usage: create-doc [-r REPO_URL] [-d] [-t] [-g] [-l]"
1617
echo "Options:"
1718
echo " -d: Downloads the Khiops tutorial repository. Implies -t. See also -r."
1819
echo " -t: Transform the Khiops Jupyter notebooks tutorials into reST."
19-
echo " -r: Set the Khiops tutorial repository. The default is"
20+
echo " -r: Set the Khiops tutorial repository URL. The default is"
2021
echo " '$DEFAULT_KHIOPS_TUTORIAL_REPO_URL'."
22+
echo " -g: Set the Khiops tutorial repository Git reference. The default is"
23+
echo " '$DEFAULT_KHIOPS_TUTORIAL_REPO_REF'."
2124
echo " -l: Directory of the local copy of the khiops tutorial repository. The default is"
2225
echo " '$DEFAULT_KHIOPS_TUTORIAL_DIR'."
2326
echo ""
@@ -29,17 +32,19 @@ exit_bad() {
2932
}
3033

3134
# Read command line arguments
32-
while getopts "dtr:l:" opt
35+
while getopts "dtrg:l:" opt
3336
do
3437
case "$opt" in
3538
d ) DOWNLOAD_REPO=true && TRANSFORM_NOTEBOOKS="true" ;;
3639
t ) TRANSFORM_NOTEBOOKS="true" ;;
3740
r ) KHIOPS_TUTORIAL_REPO_URL="$OPTARG" ;;
41+
g ) KHIOPS_TUTORIAL_REPO_REF="$OPTARG" ;;
3842
l ) KHIOPS_TUTORIAL_REPO_DIR="$OPTARG" ;;
3943
* ) exit_bad ;;
4044
esac
4145
done
4246
KHIOPS_TUTORIAL_REPO_URL="${KHIOPS_TUTORIAL_REPO_URL:-$DEFAULT_KHIOPS_TUTORIAL_REPO_URL}"
47+
KHIOPS_TUTORIAL_REPO_REF="${KHIOPS_TUTORIAL_REPO_REF:-$DEFAULT_KHIOPS_TUTORIAL_REPO_REF}"
4348
KHIOPS_TUTORIAL_REPO_DIR="${KHIOPS_TUTORIAL_REPO_DIR:-$DEFAULT_KHIOPS_TUTORIAL_DIR}"
4449

4550

@@ -69,10 +74,9 @@ done
6974
# Clone the Khiops tutorial repository
7075
if [[ $DOWNLOAD_REPO ]]
7176
then
72-
echo "Obtaining khiops-python-tutorial"
77+
echo "Obtaining khiops-python-tutorial revision $KHIOPS_TUTORIAL_REPO_REF"
7378
rm -rf "$KHIOPS_TUTORIAL_REPO_DIR"
74-
khiops_python_tutorial_repo_branch="main"
75-
git clone --depth 1 --branch="$khiops_python_tutorial_repo_branch" \
79+
git clone --depth 1 --branch="$KHIOPS_TUTORIAL_REPO_REF" \
7680
"$KHIOPS_TUTORIAL_REPO_URL" "$KHIOPS_TUTORIAL_REPO_DIR" \
7781
&& rm -rf "$KHIOPS_TUTORIAL_REPO_DIR/.git"
7882
fi

0 commit comments

Comments
 (0)