Skip to content

Commit be15719

Browse files
authored
Merge pull request #111 from Thoemi09/DEV_APP4TRIQS_MERGE
Dev app4 triqs merge
2 parents ce55941 + 7b4f15c commit be15719

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ doc/input_output/DMFT_input/matches_comments.txt
2121
doc/input_output/DMFT_input/python_comments.txt
2222
doc/input_output/DMFT_input/solver.rst
2323
build/
24+
.claude

Jenkinsfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,17 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
3535
checkout scm
3636
/* construct a Dockerfile for this base */
3737
sh """
38-
( echo "FROM flatironinstitute/cthyb:${triqsBranch}-${env.STAGE_NAME}" ; sed '0,/^FROM /d' Docker/jenkins_ci_dockerfile ) > Dockerfile.jenkins
39-
mv -f Dockerfile.jenkins Dockerfile
38+
( echo "FROM flatironjenkins/cthyb:${triqsBranch}-${env.STAGE_NAME}" ; sed '0,/^FROM /d' Docker/jenkins_ci_dockerfile ) > Dockerfile.${env.STAGE_NAME}
39+
cp -f Dockerfile.${env.STAGE_NAME} Dockerfile
4040
"""
41+
archiveArtifacts(artifacts: "Dockerfile.${env.STAGE_NAME}")
4142
/* build and tag */
4243
def args = ''
4344
if (platform == documentationPlatform)
4445
args = '-DBuild_Documentation=0'
4546
else if (platform == "sanitize")
4647
args = '-DASAN=ON -DUBSAN=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo'
47-
def img = docker.build("flatironinstitute/${dockerName}:${env.BRANCH_NAME}-${env.STAGE_NAME}", "--build-arg APPNAME=${projectName} --build-arg BUILD_ID=${env.BUILD_TAG} --build-arg CMAKE_ARGS='${args}' .")
48+
def img = docker.build("flatironjenkins/${dockerName}:${env.BRANCH_NAME}-${env.STAGE_NAME}", "--build-arg APPNAME=${projectName} --build-arg BUILD_ID=${env.BUILD_TAG} --build-arg CMAKE_ARGS='${args}' .")
4849
catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') {
4950
img.inside("--shm-size=4gb") {
5051
sh "make -C \$BUILD/${projectName} test CTEST_OUTPUT_ON_FAILURE=1"

doc/conf.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,12 @@
9595

9696
intersphinx_mapping = {'python': ('https://docs.python.org/3.11', None), 'triqslibs': ('https://triqs.github.io/triqs/latest', None)}
9797

98+
# numpydoc options
99+
numpydoc_show_class_members = False
100+
numpydoc_show_inherited_class_members = False
101+
numpydoc_class_members_toctree = False
98102

99-
# open links in new tab instead
103+
# open links in new tab instead of same window
100104
from sphinx.writers.html import HTMLTranslator
101105
from docutils import nodes
102106
from docutils.nodes import Element

0 commit comments

Comments
 (0)