From 0e3c3a48a537923d3c65c9d59653bfe070139c8a Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Sat, 8 Aug 2020 20:47:23 -0400 Subject: [PATCH 1/5] Fix osx build environment in github actions workflow --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f1ad4a5..be6d6ae6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,12 +77,15 @@ jobs: env: CC: ${{ matrix.cc }} CXX: ${{ matrix.cxx }} + LIBRARY_PATH: /usr/local/opt/llvm/lib run: | source $HOME/install/share/triqsvars.sh mkdir build && cmake -B build cmake --build build -j2 - name: Test app4triqs + env: + DYLD_FALLBACK_LIBRARY_PATH: /usr/local/opt/llvm/lib run: | source $HOME/install/share/triqsvars.sh cd build From bcaf78501bfa1fab4dac62e59d8c7944052cb174 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Sat, 8 Aug 2020 20:47:58 -0400 Subject: [PATCH 2/5] Minor adjustments in easybuild template --- packaging/TRIQS-app4triqs-3.0.0-foss-2019a-Python-3.7.2.eb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/TRIQS-app4triqs-3.0.0-foss-2019a-Python-3.7.2.eb b/packaging/TRIQS-app4triqs-3.0.0-foss-2019a-Python-3.7.2.eb index e467ccb9..3f3289d0 100644 --- a/packaging/TRIQS-app4triqs-3.0.0-foss-2019a-Python-3.7.2.eb +++ b/packaging/TRIQS-app4triqs-3.0.0-foss-2019a-Python-3.7.2.eb @@ -45,9 +45,9 @@ separate_build_dir = True runtest = 'test' sanity_check_paths = { - 'files': ['lib/libapp4triqs_c.a'], - 'dirs': ['include', 'include/app4triqs', 'lib', - 'lib/python%(pyshortver)s/site-packages', 'share'], + 'files': ['lib/libapp4triqs_c.%s' % SHLIB_EXT], + 'dirs': ['include/app4triqs', 'lib', 'share', + 'lib/python%(pyshortver)s/site-packages/app4triqs'], } sanity_check_commands = ["python -c 'import app4triqs'"] From d72b245d564ffd1b59df63dbed6ad98288b9c549 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Sat, 8 Aug 2020 20:53:25 -0400 Subject: [PATCH 3/5] [cmake] Disable warnings about use of comma operator in subscript operator --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 14385490..b9d9039a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,6 +103,7 @@ target_compile_options(${PROJECT_NAME}_warnings -Wextra -Wpedantic -Wno-sign-compare + -Wno-deprecated-comma-subscript $<$:-Wshadow=local> $<$:-Wno-attributes> $<$:-Wshadow> From a15569f18b5a3fc06a350a58012d4c8ce9cb94b1 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Mon, 10 Aug 2020 10:57:38 -0400 Subject: [PATCH 4/5] [doc] No need to store agogo sphinx theme --- doc/themes/agogo/layout.html | 92 ----- doc/themes/agogo/static/agogo.css_t | 519 --------------------------- doc/themes/agogo/static/bgfooter.png | Bin 434 -> 0 bytes doc/themes/agogo/static/bgtop.png | Bin 430 -> 0 bytes doc/themes/agogo/theme.conf | 20 -- 5 files changed, 631 deletions(-) delete mode 100644 doc/themes/agogo/layout.html delete mode 100644 doc/themes/agogo/static/agogo.css_t delete mode 100644 doc/themes/agogo/static/bgfooter.png delete mode 100644 doc/themes/agogo/static/bgtop.png delete mode 100644 doc/themes/agogo/theme.conf diff --git a/doc/themes/agogo/layout.html b/doc/themes/agogo/layout.html deleted file mode 100644 index 869d76ad..00000000 --- a/doc/themes/agogo/layout.html +++ /dev/null @@ -1,92 +0,0 @@ -{# - agogo/layout.html - ~~~~~~~~~~~~~~~~~ - - Sphinx layout template for the agogo theme, originally written - by Andi Albrecht. - - :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS. - :license: BSD, see LICENSE for details. -#} -{% extends "basic/layout.html" %} - -{% block header %} -
-
- {%- if logo %} - - {%- endif %} - {%- block headertitle %} -

{{ shorttitle|e }}

- {%- endblock %} -
- HOME | - {%- for rellink in rellinks %} - {{ rellink[3] }} - {%- if not loop.last %}{{ reldelim2 }}{% endif %} - {%- endfor %} -
-
-
-{% endblock %} - -{% block content %} -
-
-
- {%- block document %} - {{ super() }} - {%- endblock %} -
-
- {%- block sidebartoc %} -

{{ _('Table Of Contents') }}

- {{ toctree(maxdepth=3) }} - {%- endblock %} - {%- block sidebarsearch %} -

{{ _('Search') }}

-
- - - - -
-

- {{ _('Enter search terms or a module, class or function name.') }} -

- {%- endblock %} -
-
-
-
-{% endblock %} - -{% block footer %} -
-
-
- {%- for rellink in rellinks %} - {{ rellink[3] }} - {%- if not loop.last %}{{ reldelim2 }}{% endif %} - {%- endfor %} - {%- if show_source and has_source and sourcename %} -
- {{ _('Show Source') }} - {%- endif %} -
- -
- {{ super() }} -
-
-
-
-{% endblock %} - -{% block relbar1 %}{% endblock %} -{% block relbar2 %}{% endblock %} diff --git a/doc/themes/agogo/static/agogo.css_t b/doc/themes/agogo/static/agogo.css_t deleted file mode 100644 index 5e4b0c66..00000000 --- a/doc/themes/agogo/static/agogo.css_t +++ /dev/null @@ -1,519 +0,0 @@ -/* - * agogo.css_t - * ~~~~~~~~~~~ - * - * Sphinx stylesheet -- agogo theme. - * - * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS. - * :license: BSD, see LICENSE for details. - * - */ - -* { - margin: 0px; - padding: 0px; -} - -body { - font-family: {{ theme_bodyfont }}; - font-size: 100%; // TRIQS - line-height: 1.0em; // TRIQS - color: black; - background-color: {{ theme_bgcolor }}; -} - - -/* Page layout */ - -div.header, div.content, div.footer { - width: {{ theme_pagewidth }}; - margin-left: auto; - margin-right: auto; -} - -div.header-wrapper { - background: {{ theme_headerbg }}; - border-bottom: 3px solid #2e3436; -} - - -/* Default body styles */ -a { - color: {{ theme_linkcolor }}; -} - -div.bodywrapper a, div.footer a { - text-decoration: none; // TRIQS -} - -div.bodywrapper a:hover, div.footer a:hover { - text-decoration: underline; // TRIQS -} - -.clearer { - clear: both; -} - -.left { - float: left; -} - -.right { - float: right; -} - -.line-block { - display: block; - margin-top: 1em; - margin-bottom: 1em; -} - -.line-block .line-block { - margin-top: 0; - margin-bottom: 0; - margin-left: 1.5em; -} - -h1, h2, h3, h4 { - font-family: {{ theme_headerfont }}; - font-weight: normal; - color: {{ theme_headercolor2 }}; - margin-bottom: .8em; -} - -h1 { - color: {{ theme_headercolor1 }}; -} - -h2 { - padding-bottom: .5em; - border-bottom: 1px solid {{ theme_headercolor2 }}; -} - -a.headerlink { - visibility: hidden; - color: #dddddd; - padding-left: .3em; -} - -h1:hover > a.headerlink, -h2:hover > a.headerlink, -h3:hover > a.headerlink, -h4:hover > a.headerlink, -h5:hover > a.headerlink, -h6:hover > a.headerlink, -dt:hover > a.headerlink { - visibility: visible; -} - -img { - border: 0; -} - -div.admonition { - margin-top: 10px; - margin-bottom: 10px; - padding: 2px 7px 1px 7px; - border-left: 0.2em solid black; -} - -p.admonition-title { - margin: 0px 10px 5px 0px; - font-weight: bold; - color: red; // TRIQS -} - -dt:target, .highlighted { - background-color: #fbe54e; -} - -/* Header */ - -div.header { - padding-top: 10px; - padding-bottom: 10px; -} - -div.header h1 { - font-family: {{ theme_headerfont }}; - font-weight: normal; - font-size: 180%; - letter-spacing: .08em; -} - -div.header h1 a { - color: white; -} - -div.header div.rel { - margin-top: -1em; // TRIQS -} - -div.header div.rel a { - color: {{ theme_headerlinkcolor }}; - letter-spacing: .1em; - text-transform: uppercase; -} - -p.logo { - float: right; -} - -img.logo { - border: 0; -} - - -/* Content */ -div.content-wrapper { - background-color: white; - padding-top: 20px; - padding-bottom: 20px; -} - -div.document { - width: {{ theme_documentwidth }}; - float: left; -} - -div.body { - padding-right: 2em; - text-align: {{ theme_textalign }}; -} - -div.document ul { - margin: 1.5em; - list-style-type: square; -} - -div.document dd { - margin-left: 1.2em; - margin-top: .4em; - margin-bottom: 1em; -} - -div.document .section { - margin-top: 1.7em; -} -div.document .section:first-child { - margin-top: 0px; -} - -div.document div.highlight { - line-height: 1.0em; // TRIQS - padding: 3px; - background-color: #eeeeec; - border-top: 2px solid #dddddd; - border-bottom: 2px solid #dddddd; - margin-top: .8em; - margin-bottom: .8em; -} - -div.document h2 { - margin-top: .7em; -} - -div.document p { - margin-bottom: .5em; -} - -div.document li.toctree-l1 { - margin-bottom: 0em; // TRIQS -} -div.document li.toctree-l2 { - margin-bottom: 0em; // TRIQS -} - -div.document .descname { - font-weight: bold; - color: blue; // TRIQS -} - -div.document .docutils.literal { - background-color: #eeeeec; - padding: 1px; -} - -div.document .docutils.xref.literal { - background-color: transparent; - padding: 0px; -} - -div.document blockquote { - margin: 1em; -} - -div.document ol { - margin: 1.5em; -} - - -/* Sidebar */ - -div.sidebar { - width: {{ theme_sidebarwidth }}; - float: right; - font-size: .9em; -} - -div.sidebar a, div.header a { - text-decoration: none; -} - -div.sidebar a:hover, div.header a:hover { - text-decoration: underline; -} - -div.sidebar h3 { - color: #2e3436; - text-transform: uppercase; - font-size: 130%; - letter-spacing: .1em; -} - -div.sidebar ul { - list-style-type: none; -} - -div.sidebar li.toctree-l1 a { - display: block; - padding: 1px; - border: 1px solid #dddddd; - background-color: #eeeeec; - margin-bottom: .4em; - padding-left: 3px; - color: #2e3436; -} - -div.sidebar li.toctree-l2 a { - background-color: transparent; - border: none; - margin-left: 1em; - border-bottom: 1px solid #dddddd; -} - -div.sidebar li.toctree-l3 a { - background-color: transparent; - border: none; - margin-left: 2em; - border-bottom: 1px solid #dddddd; -} - -div.sidebar li.toctree-l2:last-child a { - border-bottom: none; -} - -div.sidebar li.toctree-l1.current a { - border-right: 5px solid {{ theme_headerlinkcolor }}; -} - -div.sidebar li.toctree-l1.current li.toctree-l2 a { - border-right: none; -} - - -/* Footer */ - -div.footer-wrapper { - background: {{ theme_footerbg }}; - border-top: 4px solid #babdb6; - padding-top: 10px; - padding-bottom: 10px; - min-height: 80px; -} - -div.footer, div.footer a { - color: #888a85; -} - -div.footer .right { - text-align: right; -} - -div.footer .left { - text-transform: uppercase; -} - - -/* Styles copied from basic theme */ - -/* -- search page ----------------------------------------------------------- */ - -ul.search { - margin: 10px 0 0 20px; - padding: 0; -} - -ul.search li { - padding: 5px 0 5px 20px; - background-image: url(file.png); - background-repeat: no-repeat; - background-position: 0 7px; -} - -ul.search li a { - font-weight: bold; -} - -ul.search li div.context { - color: #888; - margin: 2px 0 0 30px; - text-align: left; -} - -ul.keywordmatches li.goodmatch a { - font-weight: bold; -} - -/* -- index page ------------------------------------------------------------ */ - -table.contentstable { - width: 100%; -} - -table.contentstable td { - padding: 10px 10px 10px 0; -} - -table.contentstable p.biglink { - line-height: 150%; - text-align: left; -} - -a.biglink { - font-size: 1.3em; -} - -span.linkdescr { - font-style: italic; - padding-top: 5px; - font-size: 90%; -} - -/* -- general index --------------------------------------------------------- */ - -table.indextable td { - text-align: left; - vertical-align: top; -} - -table.indextable dl, table.indextable dd { - margin-top: 0; - margin-bottom: 0; -} - -table.indextable tr.pcap { - height: 10px; -} - -table.indextable tr.cap { - margin-top: 10px; - background-color: #f2f2f2; -} - -img.toggler { - margin-right: 3px; - margin-top: 3px; - cursor: pointer; -} - -/* -- viewcode extension ---------------------------------------------------- */ - -.viewcode-link { - float: right; -} - -.viewcode-back { - float: right; - font-family:: {{ theme_bodyfont }}; -} - -div.viewcode-block:target { - margin: -1px -3px; - padding: 0 3px; - background-color: #f4debf; - border-top: 1px solid #ac9; - border-bottom: 1px solid #ac9; -} - -/* -- added for TRIQS ------------------------------------------------------- */ - -div.warning { - margin: 1em 0 1em 0; - border: 1px solid #86989B; - background-color: lightpink; //#f7f7f7; -} - -div.note { - margin: 1em 0 1em 0; - border: 1px solid #86989B; - background-color: lightcyan; //#f7f7f7; -} - -div.note p.admonition-title { - margin: 0px 10px 5px 0px; - font-weight: bold; - color : blue; -} - -div.highlight-python { - margin-top : 5px; - margin-bottom : 7px; - background-color: lightcyan; //#f4debf; -} - -/* -- math display ---------------------------------------------------------- */ - -img.math { - vertical-align: middle; -} - -div.body div.math p { - text-align: center; -} - -span.eqno { - float: right; -} - -/* -- tables ---------------------------------------------------------------- */ - -table.docutils { - border: 0; - border-collapse: collapse; -} - -table.docutils head { - color : blue; -} - -table.docutils td, table.docutils th { - padding: 1px 8px 1px 5px; - border-top: 0; - border-left: 0; - border-right: 0; - border-bottom: 1px solid #aaa; -} - -table.field-list td, table.field-list th { - border: 0 !important; -} - -table.footnote td, table.footnote th { - border: 0 !important; -} - -th { - text-align: left; - padding-right: 5px; -} - -table.citation { - border-left: solid 1px gray; - margin-left: 1px; -} - -table.citation td { - border-bottom: none; -} - diff --git a/doc/themes/agogo/static/bgfooter.png b/doc/themes/agogo/static/bgfooter.png deleted file mode 100644 index 9ce5bdd902943fdf8b0c0ca6a545297e1e2cc665..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmV;j0ZsmiP)Px#24YJ`L;%wO*8tD73qoQ5000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXD> z2Q(2CT#42I000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0003ENklR?sq9~H`=l5UI-{JW_f9!)=Hwush3JC}Y z1gFM&r>$lJNPt^*1k!w;l|obx>lr$2IOaI$n=(gBBaj^I0=y%@K5N&GIU&-%OE_~V zX=m=_j7d`hvubQRuF+xT63vIfWnC3%kKN*T3l7ob3nEC2R->wU1Y)4)(7_t^thiqb zj$CO7xBn9gg`*!MY$}SI|_*)!a*&V0w7h>cUb&$Grh37iJ=C%Yn c>}w1E0Z4f>1OEiDlmGw#07*qoM6N<$g4BwtIsgCw diff --git a/doc/themes/agogo/static/bgtop.png b/doc/themes/agogo/static/bgtop.png deleted file mode 100644 index a0d4709bac8f79943a817195c086461c8c4d5419..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 430 zcmV;f0a5;mP)Px#24YJ`L;zI)R{&FzA;Z4_000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXD> z2Q3AZhV-)l000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0003ANklMo8vqN`cM=KwSQV|n zk}naE+VzlN;kK@Ej${PSkI$-R6-Yfp`zA;^O$`)7`gRi{-0i?owGIbX{p>Nc##93U z;sA|ayOYkG%F9M0iEMUM*s3NDYSS=KN2ht8Rv|7nv77i{NTO47R)}V_+2H~mL-nTR z_8j}*%6Qm8?#7NU2kM$#gcP&kO?iw|n}ynz+r-~FA9nKcZnfixWvZ&d28Cc_6&_Pe zMpbjI>9r+<=}NIDz4mCd3U++H?rrHcYxH&eeB|)>mnv*N#44ILM2zL6yU!VVWSrgp Y0Yu&#qm)=by8r+H07*qoM6N<$f@HC)j{pDw diff --git a/doc/themes/agogo/theme.conf b/doc/themes/agogo/theme.conf deleted file mode 100644 index e2108d96..00000000 --- a/doc/themes/agogo/theme.conf +++ /dev/null @@ -1,20 +0,0 @@ -[theme] -inherit = basic -stylesheet = agogo.css -pygments_style = tango - -[options] -bodyfont = "Verdana", Arial, sans-serif -headerfont = "Georgia", "Times New Roman", serif -pagewidth = 80% -documentwidth = 75% -sidebarwidth = 22.5% -bgcolor = #eeeeec -headerbg = url(bgtop.png) top left repeat-x -footerbg = url(bgfooter.png) top left repeat-x -linkcolor = #ce5c00 -headercolor1 = #204a87 -headercolor2 = #3465a4 -headerlinkcolor = #fcaf3e -textalign = justify -index = index From 57a08de1559fe12c034ba6cbb8d30724b35258f9 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Mon, 10 Aug 2020 11:07:05 -0400 Subject: [PATCH 5/5] [doc] Revert to cloudflare mathjax url --- doc/conf.py.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/conf.py.in b/doc/conf.py.in index 7662c9ba..3a134526 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -25,7 +25,7 @@ version = '@PROJECT_VERSION@' copyright = '2017-2018 N. Wentzell, O. Parcollet 2018-2019 The Simons Foundation, authors: N. Wentzell, D. Simons, H. Strand, O. Parcollet' -mathjax_path = "https://raw.githubusercontent.com/mathjax/MathJax/2.7.8/MathJax.js" +mathjax_path = "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=default" templates_path = ['@CMAKE_CURRENT_SOURCE_DIR@/_templates'] html_theme = 'triqs'