Skip to content

Commit f6ffc82

Browse files
d3j331d3j331
committed
docker ymnl build changes
1 parent 75cb320 commit f6ffc82

File tree

16 files changed

+2707
-1039
lines changed

16 files changed

+2707
-1039
lines changed

‎.github/workflows/docker-publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
SIM_GRP=runner
6565
6666
- name: List images
67-
run: docker images | grep -E "cosim|tesp"
67+
run: docker images | grep -E "tesp"
6868

6969
- name: Smoke test
7070
run: |

‎scripts/build/AMES-V5.0.id‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
992d52523918c0ae9c68cc9072b8026b9205eb69
1+
ff64fca38870facfa95896300dd8d6772d8155d6

‎scripts/build/HELICS-src.id‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
389bc89299bff6344ac23f19529ea4c701c42c72
1+
15b5f40b2b65bfe8c49f44e9652371f1625c2fea

‎scripts/build/fncs.patch‎

Lines changed: 2031 additions & 916 deletions
Large diffs are not rendered by default.

‎scripts/build/gridlab-d.id‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0affdba1e6d1ea9e4acb08308b36c5d7f17f9519
1+
e1841e1eebced819e45209f4a899763ce337b177

‎scripts/build/gridlab-d.patch‎

Lines changed: 520 additions & 9 deletions
Large diffs are not rendered by default.

‎scripts/build/stamp.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,17 @@ pip list > "${BUILD_DIR}/tesp_pypi.id"
9090

9191
echo "Stamping TESP $tesp_ver for install"
9292
cd "${TESPDIR}" || exit
93+
94+
# echo the version for the pypi setup tools
9395
echo "$tesp_ver" > "src/tesp_support/version"
96+
echo "__version__ = \"$tesp_ver\"" > "src/tesp_support/tesp_support/_version.py"
9497

9598
# un-comment for final version
9699
# git tag "v$tesp_ver"
97100

98101
echo "Creating TESP distribution package for pypi"
99102
cd "${TESPDIR}/src/tesp_support" || exit
103+
rm -rf dist/ tesp_support.egg-info/
100104
python3 -m build . > "${BUILD_DIR}/package.log"
101105
echo "Checking TESP distribution package for pypi"
102106
twine check dist/*

‎scripts/build/tesp_pypi.id‎

Lines changed: 106 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,144 @@
11
Package Version Editable project location
2-
----------------------------- ----------- ---------------------------------------
2+
----------------------------- ----------- -------------------------
33
alabaster 1.0.0
4-
aniso8601 9.0.1
5-
attrs 24.2.0
6-
babel 2.16.0
7-
backports.tarfile 1.2.0
8-
blinker 1.9.0
9-
blosc2 2.7.1
10-
build 1.2.2.post1
11-
certifi 2024.8.30
12-
cffi 1.17.1
13-
charset-normalizer 3.4.0
14-
click 8.1.7
4+
anyio 4.12.1
5+
attrs 25.4.0
6+
babel 2.18.0
7+
blosc2 4.0.0
8+
build 1.4.0
9+
Cartopy 0.25.0
10+
certifi 2026.1.4
11+
cffi 2.0.0
12+
charset-normalizer 3.4.4
13+
click 8.3.1
1514
colorama 0.4.6
1615
commonmark 0.9.1
17-
contourpy 1.3.1
18-
cryptography 44.0.0
16+
contourpy 1.3.3
17+
cosim_toolbox 1.0.1 /home/d3j331/copper/src
18+
coverage 7.13.2
19+
cryptography 46.0.4
1920
cycler 0.12.1
21+
dnspython 2.8.0
2022
docutils 0.21.2
21-
duckdb 1.1.3
23+
duckdb 1.4.4
2224
et_xmlfile 2.0.0
23-
Flask 3.1.0
24-
Flask-Cors 5.0.0
25-
Flask-RESTful 0.3.10
26-
fonttools 4.55.3
25+
fonttools 4.61.1
2726
future 1.0.0
28-
ghp-import 2.1.0
29-
greenlet 3.1.1
30-
h5py 3.11.0
31-
helics 3.5.3
32-
idna 3.10
27+
h11 0.16.0
28+
h5py 3.15.1
29+
helics 3.6.1
30+
id 1.5.0
31+
idna 3.11
3332
imagesize 1.4.1
34-
importlib_metadata 8.5.0
35-
importlib_resources 6.4.5
36-
itsdangerous 2.2.0
33+
importlib_resources 6.5.2
34+
iniconfig 2.3.0
3735
jaraco.classes 3.4.0
38-
jaraco.context 6.0.1
39-
jaraco.functools 4.1.0
40-
jeepney 0.8.0
41-
Jinja2 3.1.4
42-
joblib 1.4.2
36+
jaraco.context 6.1.0
37+
jaraco.functools 4.4.0
38+
jeepney 0.9.0
39+
Jinja2 3.1.6
40+
joblib 1.5.3
4341
JsonForm 0.0.2
4442
jsonpointer 3.0.0
45-
jsonschema 4.23.0
46-
jsonschema-specifications 2024.10.1
43+
jsonschema 4.26.0
44+
jsonschema-specifications 2025.9.1
4745
JsonSir 0.0.2
48-
keyring 25.5.0
49-
kiwisolver 1.4.7
50-
latexcodec 3.0.0
46+
keyring 25.7.0
47+
kiwisolver 1.4.9
48+
latexcodec 3.0.1
5149
markdown-it-py 3.0.0
52-
MarkupSafe 3.0.2
53-
matplotlib 3.9.3
50+
MarkupSafe 3.0.3
51+
matplotlib 3.10.8
52+
mdit-py-plugins 0.5.0
5453
mdurl 0.1.2
55-
more-itertools 10.5.0
56-
msgpack 1.1.0
57-
ndindex 1.9.2
58-
networkx 3.4.2
59-
nh3 0.2.19
54+
more-itertools 10.8.0
55+
msgpack 1.1.2
56+
myst-parser 4.0.1
57+
narwhals 2.16.0
58+
ndindex 1.10.1
59+
networkx 3.6.1
60+
nh3 0.3.2
6061
nose 1.3.7
61-
NREL-PySAM 5.1.0
62-
numexpr 2.10.2
63-
numpy 1.26.4
62+
NREL-PySAM 7.1.0
63+
numexpr 2.14.1
64+
numpy 2.3.5
6465
openpyxl 3.1.5
65-
packaging 24.2
66-
pandas 2.2.3
67-
pillow 11.0.0
68-
pip 24.3.1
69-
pkginfo 1.12.0
70-
plotly 5.24.1
66+
packaging 26.0
67+
pandas 2.3.3
68+
pillow 12.1.0
69+
pip 24.0
70+
plotly 6.5.2
71+
pluggy 1.6.0
7172
ply 3.11
72-
psst 0.1.1a0 /home/d3j331/grid/repo/AMES-V5.0/psst
73-
PuLP 2.9.0
73+
psycopg2-binary 2.9.11
74+
PuLP 3.3.0
7475
py-cpuinfo 9.0.0
75-
pybtex 0.24.0
76+
pybtex 0.25.1
7677
pybtex-docutils 1.0.3
77-
pycparser 2.22
78-
PyGLM 2.7.3
79-
Pygments 2.18.0
80-
pyjson5 1.6.7
81-
Pyomo 6.5.0
82-
pyparsing 3.2.0
83-
PYPOWER 5.1.16
78+
pycparser 3.0
79+
pyglm 2.8.3
80+
Pygments 2.19.2
81+
pyjson5 2.0.0
82+
pymongo 4.16.0
83+
pyomo 6.9.5
84+
pyparsing 3.3.2
85+
PYPOWER 5.1.19
86+
pyproj 3.7.2
8487
pyproject_hooks 1.2.0
88+
pyshp 3.0.3
89+
pytest 9.0.2
90+
pytest-cov 7.0.0
8591
python-dateutil 2.9.0.post0
86-
python-dotenv 1.0.1
8792
Python-EasyConfig 0.1.7
88-
pytz 2024.2
93+
pytz 2025.2
8994
PyUtilib 6.0.0
90-
PyYAML 6.0.2
95+
PyYAML 6.0.3
9196
readme_renderer 44.0
9297
recommonmark 0.7.1
93-
referencing 0.35.1
94-
requests 2.32.3
98+
referencing 0.37.0
99+
requests 2.32.5
95100
requests-toolbelt 1.0.0
96101
Resource 0.2.1
97102
rfc3986 2.0.0
98-
rich 13.9.4
99-
rpds-py 0.22.3
100-
scikit-learn 1.5.2
101-
scipy 1.14.1
103+
rich 14.3.2
104+
roman-numerals 4.1.0
105+
roman-numerals-py 4.1.0
106+
rpds-py 0.30.0
107+
scikit-learn 1.8.0
108+
scipy 1.17.0
102109
seaborn 0.13.2
103-
SecretStorage 3.3.3
104-
setuptools 75.6.0
110+
SecretStorage 3.5.0
111+
setuptools 80.10.2
112+
shapely 2.1.2
105113
six 1.17.0
106-
snowballstemmer 2.2.0
107-
Sphinx 8.1.3
108-
sphinx-jsonschema 1.19.1
109-
sphinx-rtd-theme 3.0.2
114+
snowballstemmer 3.0.1
115+
Sphinx 8.2.3
116+
sphinx-autobuild 2025.8.25
117+
sphinx-jsonschema 1.19.2
118+
sphinx_rtd_theme 3.1.0
110119
sphinxcontrib-applehelp 2.0.0
111-
sphinxcontrib-bibtex 2.6.3
120+
sphinxcontrib-bibtex 2.6.5
112121
sphinxcontrib-devhelp 2.0.0
113-
sphinxcontrib-fulltoc 1.2.0
114122
sphinxcontrib-htmlhelp 2.1.0
115123
sphinxcontrib-jquery 4.1
116-
sphinxcontrib-jsdemo 0.1.4
117124
sphinxcontrib-jsmath 1.0.1
125+
sphinxcontrib-mermaid 2.0.0
126+
sphinxcontrib-plantuml 0.31
118127
sphinxcontrib-qthelp 2.0.0
119128
sphinxcontrib-serializinghtml 2.0.0
120-
SQLAlchemy 2.0.36
121-
strip-hints 0.1.10
122-
tables 3.10.1
123-
tenacity 9.0.0
124-
tesp_support 1.3.5 /home/d3j331/grid/tesp/src/tesp_support
125-
threadpoolctl 3.5.0
126-
tomli 2.2.1
127-
twine 6.0.1
128-
typing_extensions 4.12.2
129-
tzdata 2024.2
130-
urllib3 2.2.3
131-
Werkzeug 3.1.3
132-
wheel 0.45.1
133-
xarray 2024.9.0
134-
xlrd 2.0.1
135-
zipp 3.21.0
129+
starlette 0.52.1
130+
strip-hints 0.1.13
131+
tables 3.10.2
132+
threadpoolctl 3.6.0
133+
tqdm 4.67.2
134+
twine 6.2.0
135+
typing_extensions 4.15.0
136+
tzdata 2025.3
137+
urllib3 2.6.3
138+
uvicorn 0.40.0
139+
watchfiles 1.1.1
140+
waterfallcharts 3.8
141+
websockets 16.0
142+
wheel 0.46.3
143+
xarray 2025.12.0
144+
xlrd 2.0.2

‎scripts/docker/push-images.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ docker_tag=${tesp_ver}_ubuntu_${grid_ver}
1616
# you may need log out first `docker logout` ref. https://stackoverflow.com/a/53835882/248616
1717
# docker login
1818

19-
# gives following response:
19+
# gives following example response:
2020

2121
# USING WEB-BASED LOGIN
2222
# To sign in with credentials on the command line, use 'docker login -u <username>'
@@ -31,5 +31,5 @@ docker_tag=${tesp_ver}_ubuntu_${grid_ver}
3131
#
3232
# Login Succeeded
3333

34-
docker tag cosim-build:tesp_${grid_ver} pnnl/tesp:${docker_tag}
34+
docker tag tesp-build:tesp_${grid_ver} pnnl/tesp:${docker_tag}
3535
docker push pnnl/tesp:${docker_tag}

‎scripts/docker/user.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN echo "===== Building Example User =====" && \
1717
echo "<<<< Changing the '${SIM_GID}' group id for '${SIM_GRP} >>>>" && \
1818
groupdel ${SIM_GRP} && \
1919
groupadd --gid ${SIM_GID} ${SIM_GRP} && \
20-
usermod -aG sudo,${SIM_GRP} ${SIM_USER}
20+
usermod -aG sudo,${SIM_GRP} -g ${SIM_GRP} ${SIM_USER}
2121

2222
# Switch to '$SIM_USER'
2323
USER ${SIM_USER}

0 commit comments

Comments
 (0)