Skip to content

Commit 2669734

Browse files
committed
Replace py-rdl install script with danagroup conda package
1 parent dd6bf29 commit 2669734

5 files changed

Lines changed: 3 additions & 111 deletions

File tree

.github/workflows/gh-pages.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ jobs:
5151
run: make compile -C ARC -j"$(nproc)"
5252
shell: micromamba-shell {0}
5353

54-
# ── Install pyrdl ──────────────────────
55-
- name: Install pyrdl
56-
run: make install-pyrdl -C ARC -j"$(nproc)"
57-
shell: micromamba-shell {0}
58-
5954
# ── minimal TeX for png‑math in Sphinx ──────────────────────
6055
- name: System TeX tools
6156
run: sudo apt-get update -y && sudo apt-get -y install texlive-latex-extra dvipng

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
DEVTOOLS_DIR := devtools
88

99
.PHONY: all help clean test test-unittests test-functional test-all \
10-
install-all install-ci install-pyrdl install-rmg install-rmgdb install-autotst install-gcn \
10+
install-all install-ci install-rmg install-rmgdb install-autotst install-gcn \
1111
install-gcn-cpu install-kinbot install-sella install-xtb install-torchani install-ob \
1212
lite check-env compile
1313

@@ -27,7 +27,6 @@ help:
2727
@echo "Installation:"
2828
@echo " install Install all external dependencies"
2929
@echo " install-ci Install all external dependencies for CI (no clean)"
30-
@echo " install-pyrdl Install PyRDL"
3130
@echo " install-rmg Install RMG (default: packaged, override via RMG_ARGS=...)"
3231
@echo " install-rmgdb Install RMG-database"
3332
@echo " install-autotst Install AutoTST"
@@ -73,9 +72,6 @@ install-lite:
7372
@echo "Installing ARC's lite version (no external dependencies)..."
7473
bash $(DEVTOOLS_DIR)/install_all.sh --no-ext --rmg-rms
7574

76-
install-pyrdl:
77-
bash $(DEVTOOLS_DIR)/install_pyrdl.sh
78-
7975
install-rmg:
8076
bash $(DEVTOOLS_DIR)/install_rmg.sh $(RMG_ARGS)
8177

devtools/install_all.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,7 @@ pushd . >/dev/null
7171
echo "=== Installing RMG ==="
7272
run_devtool install_rmg.sh "${RMG_ARGS[@]}"
7373

74-
75-
# 2) PyRDL
76-
echo "=== Installing PyRDL ==="
77-
bash devtools/install_pyrdl.sh
78-
79-
# 3) ARC itself (skip env creation in CI or if user requests it)
74+
# 2) ARC itself (skip env creation in CI or if user requests it)
8075
if [[ "${CI:-false}" != "true" && "${SKIP_ARC:-false}" != "true" ]]; then
8176
if [[ $SKIP_CLEAN == false ]]; then
8277
echo "=== Cleaning up old ARC build artifacts ==="

devtools/install_pyrdl.sh

Lines changed: 0 additions & 95 deletions
This file was deleted.

environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ dependencies:
3333
- conda-forge::matplotlib
3434
- conda-forge::networkx
3535
- danagroup::openbabel >=3
36+
- danagroup::py-rdl
3637
- conda-forge::pandas
3738
- conda-forge::paramiko >=2.6.0
3839
- conda-forge::py3dmol >=0.8.0

0 commit comments

Comments
 (0)