.coafile

@@ -2,3 +2,8 @@
 bears = SpaceConsistencyBear
 files = **Makefile.am
 use_spaces = False
+
+[GitLabYAML]
+bears = SpaceConsistencyBear
+files = .gitlab-ci.yml, .gitlab/ci/*.yml
+use_spaces = True

.gitlab-ci.yml

@@ -199,28 +199,25 @@ default:
 
 # helper template for jobs running on macOS
 .macos-job:
-  # if the build fails during the distcheck phase then subsequent builds will
-  # fail with permissions errors, reset the permissions
-  after_script:
-    - chmod -R +w $CI_PROJECT_DIR
-  # do not cancel macOS job when a newer pipeline starts, to avoid issues
-  # with permission errors (see above)
-  interruptible: false
+  # use the clone strategy so permissions are correctly reset on any failed jobs
+  # see: https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/3726
+  variables:
+    GIT_STRATEGY: clone
 
+# tag for macOS x86_64 architecture jobs
 .macos:
   extends:
     - .macos-job
   tags:
     - macos_x86_64
 
+# tag for macOS arm64 architecture jobs
 .macos-arm64:
   extends:
     - .macos-job
   tags:
     - macos_arm64
 
-
-
 # -- build templates ----------------------------
 
 # jobs that build from the tarballs should not need
@@ -512,15 +509,36 @@ default:
     - export CI_COMMIT_TAG=${CI_COMMIT_TAG:-}
     # build packages
     # NOTE: we use xargs here because CONDA_BUILD_ARGS contains multiple spaces
-    - xargs -t conda ${CONDA_BUILD_CMD:-build}
-          recipe/
-          --dirty
-          --error-overlinking
-          --error-overdepending
-          --keep-old-work
-          --no-anaconda-upload
-          --variant-config-files .ci_support/${CONDA_CONFIG}.yaml
-          <<< ${CONDA_BUILD_ARGS}
+    # NOTE: retry if conda build fails due to corrupted $CONDA_PKGS_DIRS
+    - |
+      for n in 1 2; do
+        echo "===== conda ${CONDA_BUILD_CMD:-build}: attempt $n of 2 ====="
+        if ( \
+          set -o pipefail; \
+          xargs -t conda ${CONDA_BUILD_CMD:-build} \
+            recipe/ \
+            --dirty \
+            --error-overlinking \
+            --error-overdepending \
+            --keep-old-work \
+            --no-anaconda-upload \
+            --variant-config-files .ci_support/${CONDA_CONFIG}.yaml \
+            <<< ${CONDA_BUILD_ARGS} \
+          2>&1 | awk '{print} /appears to be corrupted/ {exit 1}' \
+        ); then
+          echo "----- conda ${CONDA_BUILD_CMD:-build}: success -----"
+          break
+        else
+          echo "... output from conda ${CONDA_BUILD_CMD:-build} truncated"
+          if [ $n -eq 1 ] && [ "X${CONDA_PKGS_DIRS}" != X ]; then
+            echo "----- conda ${CONDA_BUILD_CMD:-build}: possibly ${CONDA_PKGS_DIRS} is corrupted, deleting and retrying -----"
+            rm -rf ${CONDA_PKGS_DIRS}
+          else
+            echo "----- conda ${CONDA_BUILD_CMD:-build}: something else is corrupted, failing -----"
+            exit 1
+          fi
+        fi
+      done
   after_script:
     # clean cache of old files
     - find ${CONDA_PKGS_DIRS%:*} -atime +30 -delete
@@ -1166,19 +1184,19 @@ wheel:cp311-cp311-manylinux_2_28_aarch64:
     - !reference [.ci-merge-build, rules]
     - !reference [.ci-lalsuite-tag-build, rules]
     - !reference [.ci-nightly-deploy, rules]
-wheel:cp38-cp38-macosx-x86_64:
+wheel:cp38-cp38-macos-x86_64:
   extends:
     - .wheel:macos
     - .wheel:macos:x86_64
-wheel:cp39-cp39-macosx-x86_64:
+wheel:cp39-cp39-macos-x86_64:
   extends:
     - .wheel:macos
     - .wheel:macos:x86_64
-wheel:cp310-cp310-macosx-x86_64:
+wheel:cp310-cp310-macos-x86_64:
   extends:
      - .wheel:macos
      - .wheel:macos:x86_64
-wheel:cp311-cp311-macosx-x86_64:
+wheel:cp311-cp311-macos-x86_64:
   extends:
      - .wheel:macos
      - .wheel:macos:x86_64
@@ -1187,19 +1205,19 @@ wheel:cp311-cp311-macosx-x86_64:
     - !reference [.ci-merge-build, rules]
     - !reference [.ci-lalsuite-tag-build, rules]
     - !reference [.ci-nightly-deploy, rules]
-wheel:cp38-cp38-macosx-arm64:
+wheel:cp38-cp38-macos-arm64:
   extends:
     - .wheel:macos
     - .wheel:macos:arm64
-wheel:cp39-cp39-macosx-arm64:
+wheel:cp39-cp39-macos-arm64:
   extends:
     - .wheel:macos
     - .wheel:macos:arm64
-wheel:cp310-cp310-macosx-arm64:
+wheel:cp310-cp310-macos-arm64:
   extends:
      - .wheel:macos
      - .wheel:macos:arm64
-wheel:cp311-cp311-macosx-arm64:
+wheel:cp311-cp311-macos-arm64:
   extends:
      - .wheel:macos
      - .wheel:macos:arm64
@@ -1647,16 +1665,16 @@ wheel:pypi:
     - wheel:cp39-cp39-manylinux_2_28_aarch64
     - wheel:cp310-cp310-manylinux_2_28_aarch64
     - wheel:cp311-cp311-manylinux_2_28_aarch64
-    - wheel:cp38-cp38-macosx-x86_64
-    - wheel:cp39-cp39-macosx-x86_64
-    - wheel:cp310-cp310-macosx-x86_64
-    - wheel:cp311-cp311-macosx-x86_64
-    - wheel:cp38-cp38-macosx-arm64
-    - wheel:cp39-cp39-macosx-arm64
-    - wheel:cp310-cp310-macosx-arm64
-    - wheel:cp311-cp311-macosx-arm64
+    - wheel:cp38-cp38-macos-x86_64
+    - wheel:cp39-cp39-macos-x86_64
+    - wheel:cp310-cp310-macos-x86_64
+    - wheel:cp311-cp311-macos-x86_64
+    - wheel:cp38-cp38-macos-arm64
+    - wheel:cp39-cp39-macos-arm64
+    - wheel:cp310-cp310-macos-arm64
+    - wheel:cp311-cp311-macos-arm64
   rules:
     - !reference [.ci-lalsuite-tag-build, rules]
     - !reference [.ci-nightly-deploy, rules]
   allow_failure:
-    exit_codes: 100   # EXECUTE_DEPLOY_ACTIONS!=yes
\ No newline at end of file
+    exit_codes: 100   # EXECUTE_DEPLOY_ACTIONS!=yes

common/maintainer-scripts/update_mailmap

@@ -22,7 +22,7 @@ while (<IN>) {
 }
 close IN;
 
-open IN, "git log HEAD | git shortlog --summary --email --numbered |" or die $!;
+open IN, "git log --full-history --no-merges HEAD | git shortlog --summary --email --numbered |" or die $!;
 binmode IN, ":encoding(UTF-8)";
 while (<IN>) {
   chomp;

gnuscripts/lalsuite_swig.am

@@ -243,7 +243,7 @@ nodist_swiglal_python_la_SOURCES = swiglal_@PACKAGE@_python.c
 swiglal_python_la_SOURCES = SWIGTest.c
 swiglal_python_la_CPPFLAGS = $(swig_cppflags) $(SWIG_PYTHON_CPPFLAGS) $(LAL_SYSTEM_INCLUDES)
 swiglal_python_la_CFLAGS = $(SWIG_PYTHON_CFLAGS)
-swiglal_python_la_LDFLAGS = $(LDADD) $(swig_ldflags) $(SWIG_PYTHON_LDFLAGS) $(EXTRA_SWIG_PYTHON_LDFLAGS)
+swiglal_python_la_LDFLAGS = $(LDADD) $(swig_ldflags) $(SWIG_PYTHON_LDFLAGS) $(SWIG_PYTHON_FLAT_NAMESPACE_LDFLAG)
 swiglal_python_la_LIBTOOLFLAGS = $(swig_libtoolflags)
 
 if AMDEP

gnuscripts/lalsuite_swig.m4

@@ -2,7 +2,7 @@
 # lalsuite_swig.m4 - SWIG configuration
 # Author: Karl Wette, 2011--2017
 #
-# serial 117
+# serial 118
 
 AC_DEFUN([_LALSUITE_MIN_SWIG_VERSION],[
   # $0: minimum version of SWIG and other dependencies
@@ -519,8 +519,10 @@ EOF
         )
       done
     done
+    AC_ARG_VAR([EXTRA_SWIG_OCTAVE_LDFLAGS],[Extra linker flags for SWIG Octave bindings])
     LALSUITE_CHECK_LINK_FLAGS([
       ${swig_octave_ldflags}
+      ${EXTRA_SWIG_OCTAVE_LDFLAGS}
       ],[SWIG_OCTAVE_LDFLAGS="${SWIG_OCTAVE_LDFLAGS} ${flag}"]
     )
 
@@ -661,20 +663,19 @@ EOD`]
         [swig_python_ldflags="${swig_python_ldflags}${flag} "]
       )
     done
+    AC_ARG_VAR([EXTRA_SWIG_PYTHON_LDFLAGS],[Extra linker flags for SWIG Python bindings])
     LALSUITE_CHECK_LINK_FLAGS([
       ${swig_python_ldflags}
+      ${EXTRA_SWIG_PYTHON_LDFLAGS}
       ],[SWIG_PYTHON_LDFLAGS="${SWIG_PYTHON_LDFLAGS} ${flag}"]
     )
 
-    # allow addition of extra Python linker flags
-    AC_ARG_VAR([EXTRA_SWIG_PYTHON_LDFLAGS],[Extra linker flags for SWIG Python bindings])
-
-    extra_swig_python_ldflags="-Wl,-flat_namespace"
-    AC_SUBST([extra_swig_python_ldflags])
-
+    # link Python SWIG wrappings with a flat namespace on macOS
+    # - https://git.ligo.org/waveforms/reviews/newwfinterface/-/wikis/Fixing-CI-failures-due-to-segmentation-faults-on-macOS
+    AC_SUBST([SWIG_PYTHON_FLAT_NAMESPACE_LDFLAG])
     LALSUITE_CHECK_LINK_FLAGS([
-      ${extra_swig_python_ldflags}
-      ],[EXTRA_SWIG_PYTHON_LDFLAGS="${EXTRA_SWIG_PYTHON_LDFLAGS} ${flag}"]
+      [-Wl,-flat_namespace]
+      ],[SWIG_PYTHON_FLAT_NAMESPACE_LDFLAG="${SWIG_PYTHON_FLAT_NAMESPACE_LDFLAG} ${flag}"]
     )
 
     # check for Python and NumPy headers

lal/test/tools/ValueTest.c

@@ -13,7 +13,7 @@
 #define UNUSED
 #endif
 
-#define CHAR_VALUE LAL_INT8_C(-111)
+#define CHAR_VALUE LAL_INT8_C(+111)
 #define INT2_VALUE LAL_INT8_C(-11111)
 #define INT4_VALUE LAL_INT8_C(-1111111111)
 #define INT8_VALUE LAL_INT8_C(-111111111111111111)

lalinspiral/python/lalinspiral/Makefile.am

@@ -32,7 +32,7 @@ pymodule_LTLIBRARIES = _thinca.la
 _thinca_la_SOURCES = _thinca.c
 _thinca_la_CPPFLAGS = $(AM_CPPFLAGS) $(SWIG_PYTHON_CPPFLAGS) -DMODULE_NAME="\"lalinspiral._thinca\""
 _thinca_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing -DMODULE_NAME="\"lalinspiral._thinca\""
-_thinca_la_LDFLAGS = $(AM_LDFLAGS) $(SWIG_PYTHON_LIBS) -module -avoid-version $(EXTRA_SWIG_PYTHON_LDFLAGS)
+_thinca_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version $(SWIG_PYTHON_FLAT_NAMESPACE_LDFLAG)
 
 thinca-all-local: _thinca.so
 

lalpulsar/bin/MakeData/lalpulsar_MakeSFTDAG.py

@@ -448,29 +448,25 @@ makesfts_sub = os.path.join(path_to_dag_file, 'MakeSFTs.sub')
 # create datafind.sub
 if not args.cache_file:
     with open(datafind_sub, 'w') as datafindFID:
-        datafindLogFile = '{}/datafind_{}.log'.format(args.log_path,
-                                                          dag_filename)
+        datafindLogFile = f'{args.log_path}/datafind_{dag_filename}.log'
         datafindFID.write('universe = vanilla\n')
-        datafindFID.write('executable = {}\n'.format(dataFindExe))
+        datafindFID.write(f'executable = {dataFindExe}\n')
         if not args.datafind_match:
             dataFindMatchString = ''
         else:
-            dataFindMatchString = '--match {}'.format(args.datafind_match)
+            dataFindMatchString = f'--match {args.datafind_match}'
         datafindFID.write('arguments = -r $ENV(LIGO_DATAFIND_SERVER) ')
         datafindFID.write('--observatory $(observatory) --url-type file ')
         datafindFID.write('--gps-start-time $(gpsstarttime) ')
-        datafindFID.write('--gps-end-time $(gpsendtime) --lal-cache ')
-        datafindFID.write('--type $(inputdatatype) {}\n'.format(
-            dataFindMatchString))
+        datafindFID.write('--gps-end-time $(gpsendtime) --lal-cache --gaps ')
+        datafindFID.write(f'--type $(inputdatatype) {dataFindMatchString}\n')
         datafindFID.write('getenv = True\n')
         datafindFID.write('request_disk = 5MB\n')
-        datafindFID.write('accounting_group = {}\n'.format(args.accounting_group))
-        datafindFID.write('accounting_group_user = {}\n'.format(
-            args.accounting_group_user))
-        datafindFID.write('log = {}\n'.format(datafindLogFile))
-        datafindFID.write('error = {}/datafind_$(tagstring).err\n'.format(
-            args.log_path))
-        datafindFID.write('output = {}/'.format(args.cache_path))
+        datafindFID.write(f'accounting_group = {args.accounting_group}\n')
+        datafindFID.write(f'accounting_group_user = {args.accounting_group_user}\n')
+        datafindFID.write(f'log = {datafindLogFile}\n')
+        datafindFID.write(f'error = {args.log_path}/datafind_$(tagstring).err\n')
+        datafindFID.write(f'output = {args.cache_path}/')
         datafindFID.write('$(observatory)-$(gpsstarttime)-$(gpsendtime).cache\n')
         datafindFID.write('notification = never\n')
         datafindFID.write('queue 1\n')

lalpulsar/bin/MakeData/testMakeSFTDAG.sh

@@ -57,7 +57,7 @@ fi
 testdatafindcontent=$(<$datafindsub)
 datafindfilecontent="universe = vanilla
 executable = /usr/bin/gw_data_find
-arguments = -r \$ENV(LIGO_DATAFIND_SERVER) --observatory \$(observatory) --url-type file --gps-start-time \$(gpsstarttime) --gps-end-time \$(gpsendtime) --lal-cache --type \$(inputdatatype) 
+arguments = -r \$ENV(LIGO_DATAFIND_SERVER) --observatory \$(observatory) --url-type file --gps-start-time \$(gpsstarttime) --gps-end-time \$(gpsendtime) --lal-cache --gaps --type \$(inputdatatype) 
 getenv = True
 request_disk = 5MB
 accounting_group = ligo.sim.o4.cw.explore.test