Merge branch 'master' into fedora-update

Author: j-ogas

README.rst

@@ -46,8 +46,8 @@ How do I learn more?
   detail the motivation for Charliecloud and the technology upon which it is
   based: https://www.usenix.org/publications/login/fall2017/priedhorsky
 
-* A more technical resource is our Supercomputing 2017 paper:
-  https://dl.acm.org/citation.cfm?id=3126925
+* For technical papers about Charliecloud, refer to the *Technical
+  publications* section below.
 
 Who is responsible?
 -------------------
@@ -92,8 +92,8 @@ list above.
 
 We are friendly and welcoming of diversity on all dimensions.
 
-How do I cite Charliecloud?
----------------------------
+Technical publications
+----------------------
 
 If Charliecloud helped your research, or it was useful to you in any other
 context where bibliographic citations are appropriate, please cite the
@@ -106,6 +106,35 @@ following open-access paper:
 *Note:* This paper contains out-of-date number for the size of Charliecloud’s
 code. Please instead use the current number in the FAQ.
 
+Other publications:
+
+* We compare the performance of three HPC-specific container technologies
+  against bare metal, finding no concerns about performance degradation.
+
+    Alfred Torrez, Tim Randles, and Reid Priedhorsky. “HPC container runtimes
+    have minimal or no performance impact”, 2019. In *Proc. CANOPIE HPC
+    Workshop @ SC*. DOI: `10.1109/CANOPIE-HPC49598.2019.00010
+    <https://ieeexplore.ieee.org/document/8950978>`_.
+
+* A demonstration of how low-privilege containers solve increasing demand for
+  software flexibility.
+
+    Reid Priedhorsky, R. Shane Canon, Timothy Randles, and Andrew J. Younge.
+    “Minimizing privilege for building HPC containers”, 2021. In *Proc.
+    Supercomputing*. DOI: `10.6084/m9.figshare.14396099
+    <https://doi.org/10.6084/m9.figshare.14396099>`_.
+
+* Charliecloud’s build cache performs competitively with the standard
+  many-layered union filesystem approach and has structural advantages
+  including a better diff format, lower cache overhead, and better file
+  de-duplication.
+
+    Reid Priedhorsky, Jordan Ogas, Claude H. (Rusty) Davis IV, Z. Noah
+    Hounshel, Ashlyn Lee, Benjamin Stormer, and R. Shane Goff. "Charliecloud’s
+    layer-free, Git-based container build cache", 2023. In *Proc.
+    Supercomputing*. DOI: `10.1145/3624062.3624585
+    <https://doi.org/10.1145/3624062.3624585>`_.
+
 Copyright and license
 ---------------------
 
@@ -134,4 +163,4 @@ should be clearly marked, so as not to confuse it with the version available
 from LANL.
 
 
-..  LocalWords:  USENIX's CNA Meisam
+..  LocalWords:  USENIX's CNA Meisam figshare

VERSION

@@ -1 +1 @@
-0.36~pre
+0.37~pre

autogen.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -e
-lark_version=0.11.3
+lark_version=1.1.9
 
 while [[ "$#" -gt 0 ]]; do
     case $1 in
@@ -70,9 +70,14 @@ rm -Rf Makefile.in \
        bin/config.h.in \
        build-aux \
        configure
-# Remove Lark, but only if requested.
+# Remove Lark if requested or the installed version does not match.
+lark_found=$( shopt -s nullglob; \
+              echo lib/lark*.dist-info | sed -E 's/^.*-([0-9.]+)\..*$/\1/' )
+if [[ $lark_found && $lark_found != "$lark_version" ]]; then
+    lark_shovel=yes
+fi
 if [[ $lark_shovel ]]; then
-    rm -Rfv lib/lark lib/lark-stubs lib/lark*.dist-info lib/lark*.egg-info
+    rm -Rf lib/lark lib/lark-stubs lib/lark*.dist-info lib/lark*.egg-info
 fi
 
 # Create configure and friends.
@@ -91,6 +96,11 @@ if [[ -z $clean ]]; then
         # Also remove Lark’s installer stuff.
         rm lib/lark/__pyinstaller/*.py
         rmdir lib/lark/__pyinstaller
+        # Some versions of pip install this file, while others don’t [1]. We
+        # don’t care about it, so remove it to avoid Make errors if it’s
+        # listed in Makefile.am and then an older pip is used to build.
+        # [1]: https://github.com/pypa/pip/pull/8026
+        rm -f lib/lark-${lark_version}.dist-info/REQUESTED
     fi
     if [[    -e lib/lark \
           && ! -e lib/lark-${lark_version}.dist-info/INSTALLER ]]; then