Skip to content

Commit 3cc5690

Browse files
committed
- tested changes to the kernel init method in CC;
- updated tests to account for the fact that the individual test environment will need the prompt answered in every test - resolved bug in which icrn_manager used old style kernel path headings instead of new-style language defaults
1 parent d67b87d commit 3cc5690

File tree

11 files changed

+607
-231
lines changed

11 files changed

+607
-231
lines changed

documentation/catalog_resources/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ The central repository should be organized as follows:
1313
```
1414
central_repository/
1515
├── icrn_kernel_catalog.json
16-
├── r_kernels/
16+
├── R/
1717
│ ├── cowsay/
1818
│ │ └── 1.0/
1919
│ │ └── R_cowsay.conda.pack.tar.gz
2020
│ ├── pecan/
2121
│ │ └── 1.9/
2222
│ │ └── PEcAn-base-3.tar.gz
2323
│ └── ...
24-
├── python_kernels/
24+
├── Python/
2525
│ ├── numpy/
2626
│ │ └── 1.20/
2727
│ │ └── python_numpy.conda.pack.tar.gz

icrn_manager

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ if [ ! -e ${ICRN_MANAGER_CONFIG} ]; then
2424
# Note: Auto-initialization will be handled in kernels() function
2525
# This section sets up default paths for when config doesn't exist yet
2626
ICRN_KERNEL_REPOSITORY=$central_catalog_default
27-
ICRN_R_KERNELS=${ICRN_KERNEL_REPOSITORY}"/r_kernels"
28-
ICRN_PYTHON_KERNELS=${ICRN_KERNEL_REPOSITORY}"/python_kernels"
27+
ICRN_R_KERNELS=${ICRN_KERNEL_REPOSITORY}"/R"
28+
ICRN_PYTHON_KERNELS=${ICRN_KERNEL_REPOSITORY}"/Python"
2929
ICRN_KERNEL_CATALOG=${ICRN_KERNEL_REPOSITORY}"/icrn_kernel_catalog.json"
3030
else
3131
ICRN_KERNEL_REPOSITORY=$(jq -r ".\"icrn_central_catalog_path\"" "${ICRN_MANAGER_CONFIG}")
@@ -965,8 +965,8 @@ function kernels__init() # create base resources
965965
echo "creating ${ICRN_MANAGER_CONFIG}"
966966
echo "{
967967
\"icrn_central_catalog_path\": \"${central_repository}\",
968-
\"icrn_r_kernels\": \"r_kernels\",
969-
\"icrn_python_kernels\": \"python_kernels\",
968+
\"icrn_r_kernels\": \"R\",
969+
\"icrn_python_kernels\": \"Python\",
970970
\"icrn_kernel_catalog\": \"icrn_kernel_catalog.json\"
971971
}" > $ICRN_MANAGER_CONFIG
972972
# non-append enables re-pointing of central repo via 'init' later

0 commit comments

Comments
 (0)