Add conda container driven tests

.gitlab-ci.Dockerfile.conda

@@ -18,9 +18,15 @@ LABEL name="GstLAL Runtime Package, conda" \
 # Copy source to container
 COPY gstlal /gstlal
 COPY gstlal-ugly /gstlal-ugly
+COPY gstlal-calibration /gstlal-calibration
 COPY gstlal-inspiral /gstlal-inspiral
 COPY gstlal-burst /gstlal-burst
 
+# Export environment variables needed before compile:
+ENV MKLROOT $CONDA_PREFIX
+ENV MKL_INTERFACE_LAYER LP64
+ENV MKL_THREADING_LAYER SEQUENTIAL
+
 # Make RUN commands use bash:
 SHELL ["/bin/bash", "-c"]
 
@@ -45,7 +51,7 @@ RUN . $CONDA_PREFIX/etc/profile.d/conda.sh && \
     conda activate gstlal-$CONDA_ENV && \
     cd /gstlal-ugly && \
     ./00init.sh && \
-    ./configure --prefix=$CONDA_PREFIX --without-doxygen --without-gds && \
+    ./configure --prefix=$CONDA_PREFIX --without-doxygen && \
     make -j$NUM_CORES && \
     make install -j$NUM_CORES
 RUN rm -rf gstlal-ugly
@@ -63,6 +69,21 @@ RUN . $CONDA_PREFIX/etc/profile.d/conda.sh && \
     make install -j$NUM_CORES
 RUN rm -rf gstlal-burst
 
+
+# Install gstlal-calibration
+RUN . $CONDA_PREFIX/etc/profile.d/conda.sh && \
+    conda activate gstlal-$CONDA_ENV && \
+    export PREFIX="$CONDA_PREFIX" && \
+    export CONDA_BUILD="1" && \
+    conda activate gstlal-$CONDA_ENV && \
+    cd /gstlal-calibration && \
+    ./00init.sh && \
+    ./configure --prefix=$CONDA_PREFIX --without-doxygen && \
+    make -j$NUM_CORES && \
+    make install -j$NUM_CORES
+RUN rm -rf gstlal-calibration
+
+
 # Install gstlal-inspiral
 RUN . $CONDA_PREFIX/etc/profile.d/conda.sh && \
     conda activate gstlal-$CONDA_ENV && \
@@ -87,8 +108,8 @@ FROM $CI_REGISTRY_IMAGE/dependencies/conda-$CONDA_ENV:$CI_COMMIT_REF_NAME AS run
 COPY --from=build $CONDA_PREFIX $CONDA_PREFIX
 
 # Export environment variables: 
-ENV PKG_CONFIG_PATH $CONDA_PREFIX/lib/pkgconfig
-ENV GST_PLUGIN_PATH $CONDA_PREFIX/lib/gstreamer-1.0
+ENV PKG_CONFIG_PATH $CONDA_PREFIX/envs/gstlal-$CONDA_ENV/lib/pkgconfig
+ENV GST_PLUGIN_PATH $CONDA_PREFIX/envs/gstlal-$CONDA_ENV/lib/gstreamer-1.0
 ENV GSTLAL_FIR_WHITEN 0
 ENV TMPDIR /tmp
 

.gitlab-ci.yml

@@ -39,6 +39,8 @@ stages:
   - level0
   - level1
   - level2
+  - docker
+  - docker-latest
   - test-gstlal
   - test-gstlal-only-ugly
   - test-gstlal-ugly
@@ -46,8 +48,6 @@ stages:
   - test-calibration
   - test-inspiral
   - test-offline
-  - docker
-  - docker-latest
   - docs
   - nightly-pages
 
@@ -166,8 +166,171 @@ level2:rpm:gstlal-burst:
     - level0:rpm:gstlal
     - level1:rpm:gstlal-ugly
 
-# test stages
-test:gstlal:
+# Docker Images
+
+docker:el7:
+  interruptible: true
+  stage: docker
+  before_script: [ ]
+  script:
+    # add RPMs to directory to pass to docker
+    - mkdir rpms
+
+    # Copy rpms to new container.
+    - mv rpmbuild/RPMS/x86_64/*.rpm rpms
+
+    # Clear out the old rpmbuild directory
+    - rm -rf rpmbuild*
+
+    # Build the container:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build --pull -t $DOCKER_BRANCH --file .gitlab-ci.Dockerfile.e7 .
+    - docker push $DOCKER_BRANCH
+  needs:
+    - level0:rpm:gstlal
+    - level1:rpm:gstlal-ugly
+    - level2:rpm:gstlal-calibration
+    - level2:rpm:gstlal-inspiral
+    - level2:rpm:gstlal-burst
+  only:
+    - schedules
+    - pushes
+  except:
+    - /gstlal-([a-z]+-|)[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
+
+.docker:conda: &docker-conda
+  interruptible: true
+  stage: docker
+  variables: &docker-conda-vars
+    GIT_STRATEGY: fetch
+    NUM_CORES: 4
+  before_script: [ ]
+  script:
+    - IMAGE_TAG=$CI_REGISTRY_IMAGE/conda-$CONDA_ENV:$CI_COMMIT_REF_NAME
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - >
+      docker build --pull
+      --build-arg CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE
+      --build-arg CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME
+      --build-arg CONDA_ENV=$CONDA_ENV
+      -t $IMAGE_TAG
+      --file .gitlab-ci.Dockerfile.conda
+      .
+    - docker push $IMAGE_TAG
+  needs:
+    - dependencies:conda:prod
+  only:
+    - schedules
+    - pushes
+
+docker:conda:dev:
+  <<: *docker-conda
+  variables:
+    <<: *docker-conda-vars
+    CONDA_ENV: dev
+  needs:
+    - dependencies/conda-dev
+
+docker:conda:prod:
+  <<: *docker-conda
+  variables:
+    <<: *docker-conda-vars
+    CONDA_ENV: prod
+  needs:
+    - dependencies/conda-prod
+
+docker:release:gstlal-inspiral:el7:
+  interruptible: true
+  stage: docker
+  before_script: [ ]
+  script:
+    # add RPMs to directory to pass to docker
+    - mkdir rpms
+
+    # Copy rpms to new container.
+    - mv rpmbuild/RPMS/x86_64/*.rpm rpms
+
+    # Clear out the old rpmbuild directory
+    - rm -rf rpmbuild*
+
+    # Build the container:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build --pull -t $DOCKER_BRANCH --file .gitlab-ci.Dockerfile.e7 .
+    - docker push $DOCKER_BRANCH
+  needs:
+    - level0:rpm:gstlal
+    - level1:rpm:gstlal-ugly
+    - level2:rpm:gstlal-inspiral
+  only:
+    - /gstlal-inspiral-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
+
+docker:release:gstlal-burst:el7:
+  interruptible: true
+  stage: docker
+  before_script: [ ]
+  script:
+    # add RPMs to directory to pass to docker
+    - mkdir rpms
+
+    # Copy rpms to new container.
+    - mv rpmbuild/RPMS/x86_64/*.rpm rpms
+
+    # Clear out the old rpmbuild directory
+    - rm -rf rpmbuild*
+
+    # Build the container:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build --pull -t $DOCKER_BRANCH --file .gitlab-ci.Dockerfile.e7 .
+    - docker push $DOCKER_BRANCH
+  needs:
+    - level0:rpm:gstlal
+    - level1:rpm:gstlal-ugly
+    - level2:rpm:gstlal-burst
+  only:
+    - /gstlal-burst-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
+
+docker:release:gstlal-calibration:el7:
+  interruptible: true
+  stage: docker
+  before_script: [ ]
+  script:
+    # add RPMs to directory to pass to docker
+    - mkdir rpms
+
+    # Copy rpms to new container.
+    - mv rpmbuild/RPMS/x86_64/*.rpm rpms
+
+    # Clear out the old rpmbuild directory
+    - rm -rf rpmbuild*
+
+    # Build the container:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build --pull -t $DOCKER_BRANCH --file .gitlab-ci.Dockerfile.e7 .
+    - docker push $DOCKER_BRANCH
+  needs:
+    - level0:rpm:gstlal
+    - level1:rpm:gstlal-ugly
+    - level2:rpm:gstlal-calibration
+  only:
+    - /gstlal-calibration-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
+
+latest_image:
+  interruptible: true
+  stage: docker-latest
+  before_script: [ ]
+  needs:
+    - docker:release:gstlal-inspiral:el7
+  only:
+    - /gstlal-inspiral-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
+  script:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker tag $DOCKER_BRANCH $DOCKER_LATEST
+    - docker push $DOCKER_LATEST
+  retry:
+    max: 2
+
+# test stages (el7)
+test:gstlal:el7:
   interruptible: true
   image: containers.ligo.org/alexander.pace/gstlal-dev/gstlal-dev:el7
   stage: test-gstlal
@@ -191,7 +354,7 @@ test:gstlal:
     - pushes
   allow_failure: true
 
-test:gstlal-only-ugly:
+test:gstlal-only-ugly:el7:
   interruptible: true
   image: containers.ligo.org/alexander.pace/gstlal-dev/gstlal-dev:el7
   stage: test-gstlal-only-ugly
@@ -204,10 +367,6 @@ test:gstlal-only-ugly:
     - export GSTLAL_FIR_WHITEN=0
     - gst-inspect-1.0
 
-    # Get the necessary ROM data:
-    - git clone https://git.ligo.org/alexander.pace/gstlal-testing-data.git ${GSTLAL_DIR}/gstlal-testing-data
-    - export LAL_DATA_PATH=${GSTLAL_DIR}/gstlal-testing-data/
-
     # Run doctests
     - cd gstlal
     - python3 -m pytest -c pytest.ini -m "requires_gstlal_ugly"
@@ -216,7 +375,7 @@ test:gstlal-only-ugly:
     - pushes
   allow_failure: true
 
-test:gstlal-inspiral:
+test:gstlal-inspiral:el7:
   interruptible: true
   image: containers.ligo.org/alexander.pace/gstlal-dev/gstlal-dev:el7
   stage: test-inspiral
@@ -230,10 +389,6 @@ test:gstlal-inspiral:
     - export GSTLAL_FIR_WHITEN=0
     - gst-inspect-1.0
 
-    # Get the necessary ROM data:
-    - git clone https://git.ligo.org/alexander.pace/gstlal-testing-data.git ${GSTLAL_DIR}/gstlal-testing-data
-    - export LAL_DATA_PATH=${GSTLAL_DIR}/gstlal-testing-data/
-
     # Run doctests
     - cd gstlal-inspiral
     - python3 -m pytest -c pytest.ini
@@ -242,7 +397,7 @@ test:gstlal-inspiral:
     - pushes
   allow_failure: true
 
-test:gstlal-ugly:
+test:gstlal-ugly:el7:
   interruptible: true
   image: containers.ligo.org/alexander.pace/gstlal-dev/gstlal-dev:el7
   stage: test-gstlal-ugly
@@ -255,10 +410,6 @@ test:gstlal-ugly:
     - export GSTLAL_FIR_WHITEN=0
     - gst-inspect-1.0
 
-    # Get the necessary ROM data:
-    - git clone https://git.ligo.org/alexander.pace/gstlal-testing-data.git ${GSTLAL_DIR}/gstlal-testing-data
-    - export LAL_DATA_PATH=${GSTLAL_DIR}/gstlal-testing-data/
-
     # Run doctests
     - cd gstlal-ugly
     - python3 -m pytest -c pytest.ini
@@ -267,8 +418,7 @@ test:gstlal-ugly:
     - pushes
   allow_failure: true
 
-
-test:gstlal-burst:
+test:gstlal-burst:el7:
   interruptible: true
   image: containers.ligo.org/alexander.pace/gstlal-dev/gstlal-dev:el7
   stage: test-burst
@@ -288,8 +438,7 @@ test:gstlal-burst:
     - pushes
   allow_failure: true
 
-
-test:gstlal-calibration:
+test:gstlal-calibration:el7:
   interruptible: true
   image: containers.ligo.org/alexander.pace/gstlal-dev/gstlal-dev:el7
   stage: test-calibration
@@ -309,7 +458,7 @@ test:gstlal-calibration:
     - pushes
   allow_failure: true
 
-test:offline:
+test:offline:el7:
   interruptible: true
   image: containers.ligo.org/alexander.pace/gstlal-dev/gstlal-dev:el7
   stage: test-offline
@@ -319,9 +468,9 @@ test:offline:
     - level2:rpm:gstlal-calibration
     - level2:rpm:gstlal-inspiral
     - level2:rpm:gstlal-burst
-    - test:gstlal
-    - test:gstlal-inspiral
-    - test:gstlal-burst
+    - test:gstlal:el7
+    - test:gstlal-inspiral:el7
+    - test:gstlal-burst:el7
   script:
     # Install RPMs and set up the test environment:
     - if [ -d rpmbuild ]; then yum -y install rpmbuild/RPMS/x86_64/*.rpm; fi
@@ -360,166 +509,172 @@ test:offline:
     - pushes
   allow_failure: true
 
-docker:el7:
+
+# test stages (conda)
+
+test:gstlal:conda:
   interruptible: true
-  stage: docker
+  image: $CI_REGISTRY_IMAGE/conda-dev:$CI_COMMIT_REF_NAME
+  stage: test-gstlal
+  needs:
+    - docker:conda:dev
   before_script: [ ]
   script:
-    # add RPMs to directory to pass to docker
-    - mkdir rpms
-
-    # Copy rpms to new container.
-    - mv rpmbuild/RPMS/x86_64/*.rpm rpms
-
-    # Clear out the old rpmbuild directory
-    - rm -rf rpmbuild*
+    - source $CONDA_PREFIX/etc/profile.d/conda.sh
+    - conda activate gstlal-dev
+    - echo $CONDA_PREFIX
+    - ls $CONDA_PREFIX/lib/gstreamer-1.0
+    - export GSTLAL_FIR_WHITEN=0
+    - gst-inspect-1.0
 
-    # Build the container:
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build --pull -t $DOCKER_BRANCH --file .gitlab-ci.Dockerfile.e7 .
-    - docker push $DOCKER_BRANCH
-  needs:
-    - level0:rpm:gstlal
-    - level1:rpm:gstlal-ugly
-    - level2:rpm:gstlal-calibration
-    - level2:rpm:gstlal-inspiral
-    - level2:rpm:gstlal-burst
+    # Run doctests
+    - cd gstlal
+    - python3 -m pytest -c pytest.ini -m "not requires_gstlal_ugly"
   only:
     - schedules
     - pushes
-  except:
-    - /gstlal-([a-z]+-|)[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
+  allow_failure: true
 
-.docker:conda: &docker-conda
+test:gstlal-only-ugly:conda:
   interruptible: true
-  stage: docker
-  variables: &docker-conda-vars
-    GIT_STRATEGY: fetch
-    NUM_CORES: 4
+  image: $CI_REGISTRY_IMAGE/conda-dev:$CI_COMMIT_REF_NAME
+  stage: test-gstlal-only-ugly
+  needs:
+    - docker:conda:dev
   before_script: [ ]
   script:
-    - IMAGE_TAG=$CI_REGISTRY_IMAGE/conda-$CONDA_ENV:$CI_COMMIT_REF_NAME
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - >
-      docker build --pull
-      --build-arg CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE
-      --build-arg CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME
-      --build-arg CONDA_ENV=$CONDA_ENV
-      -t $IMAGE_TAG
-      --file .gitlab-ci.Dockerfile.conda
-      .
-    - docker push $IMAGE_TAG
-  needs:
-    - dependencies:conda:prod
+    - source $CONDA_PREFIX/etc/profile.d/conda.sh
+    - conda activate gstlal-dev
+    - echo $CONDA_PREFIX
+    - ls $CONDA_PREFIX/lib/gstreamer-1.0
+    - export GSTLAL_FIR_WHITEN=0
+    - gst-inspect-1.0
+
+    # Run doctests
+    - cd gstlal
+    - python3 -m pytest -c pytest.ini -m "requires_gstlal_ugly"
   only:
     - schedules
     - pushes
+  allow_failure: true
 
-docker:conda:dev:
-  <<: *docker-conda
-  variables:
-    <<: *docker-conda-vars
-    CONDA_ENV: dev
+test:gstlal-inspiral:conda:
+  interruptible: true
+  image: $CI_REGISTRY_IMAGE/conda-dev:$CI_COMMIT_REF_NAME
+  stage: test-inspiral
   needs:
-    - dependencies/conda-dev
+    - docker:conda:dev
+  before_script: [ ]
+  script:
+    - source $CONDA_PREFIX/etc/profile.d/conda.sh
+    - conda activate gstlal-dev
+    - export GSTLAL_FIR_WHITEN=0
+    - gst-inspect-1.0
 
-docker:conda:prod:
-  <<: *docker-conda
-  variables:
-    <<: *docker-conda-vars
-    CONDA_ENV: prod
-  needs:
-    - dependencies/conda-prod
+    # Run doctests
+    - cd gstlal-inspiral
+    - python3 -m pytest -c pytest.ini
+  only:
+    - schedules
+    - pushes
+  allow_failure: true
 
-docker:release:gstlal-inspiral:el7:
+test:gstlal-ugly:conda:
   interruptible: true
-  stage: docker
+  image: $CI_REGISTRY_IMAGE/conda-dev:$CI_COMMIT_REF_NAME
+  stage: test-gstlal-ugly
+  needs:
+    - docker:conda:dev
   before_script: [ ]
   script:
-    # add RPMs to directory to pass to docker
-    - mkdir rpms
-
-    # Copy rpms to new container.
-    - mv rpmbuild/RPMS/x86_64/*.rpm rpms
-
-    # Clear out the old rpmbuild directory
-    - rm -rf rpmbuild*
+    - source $CONDA_PREFIX/etc/profile.d/conda.sh
+    - conda activate gstlal-dev
+    - export GSTLAL_FIR_WHITEN=0
+    - gst-inspect-1.0
 
-    # Build the container:
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build --pull -t $DOCKER_BRANCH --file .gitlab-ci.Dockerfile.e7 .
-    - docker push $DOCKER_BRANCH
-  needs:
-    - level0:rpm:gstlal
-    - level1:rpm:gstlal-ugly
-    - level2:rpm:gstlal-inspiral
+    # Run doctests
+    - cd gstlal-ugly
+    - python3 -m pytest -c pytest.ini
   only:
-    - /gstlal-inspiral-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
+    - schedules
+    - pushes
+  allow_failure: true
 
-docker:release:gstlal-burst:el7:
+test:gstlal-burst:conda:
   interruptible: true
-  stage: docker
+  image: $CI_REGISTRY_IMAGE/conda-dev:$CI_COMMIT_REF_NAME
+  stage: test-burst
+  needs:
+    - docker:conda:dev
   before_script: [ ]
   script:
-    # add RPMs to directory to pass to docker
-    - mkdir rpms
-
-    # Copy rpms to new container.
-    - mv rpmbuild/RPMS/x86_64/*.rpm rpms
-
-    # Clear out the old rpmbuild directory
-    - rm -rf rpmbuild*
+    - source $CONDA_PREFIX/etc/profile.d/conda.sh
+    - conda activate gstlal-dev
+    - export GSTLAL_FIR_WHITEN=0
+    - gst-inspect-1.0
+    - cd gstlal-burst
+    - python3 -m pytest -c pytest.ini
+  only:
+    - schedules
+    - pushes
+  allow_failure: true
 
-    # Build the container:
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build --pull -t $DOCKER_BRANCH --file .gitlab-ci.Dockerfile.e7 .
-    - docker push $DOCKER_BRANCH
+test:gstlal-calibration:conda:
+  interruptible: true
+  image: $CI_REGISTRY_IMAGE/conda-dev:$CI_COMMIT_REF_NAME
+  stage: test-calibration
   needs:
-    - level0:rpm:gstlal
-    - level1:rpm:gstlal-ugly
-    - level2:rpm:gstlal-burst
+    - docker:conda:dev
+  before_script: [ ]
+  script:
+    - source $CONDA_PREFIX/etc/profile.d/conda.sh
+    - conda activate gstlal-dev
+    - export GSTLAL_FIR_WHITEN=0
+    - gst-inspect-1.0
+    - cd gstlal-calibration
+    - python3 -m pytest -c pytest.ini
   only:
-    - /gstlal-burst-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
+    - schedules
+    - pushes
+  allow_failure: true
 
-docker:release:gstlal-calibration:el7:
+test:offline:conda:
   interruptible: true
-  stage: docker
+  image: $CI_REGISTRY_IMAGE/conda-dev:$CI_COMMIT_REF_NAME
+  stage: test-offline
+  needs:
+    - docker:conda:dev
+    - test:gstlal:conda
+    - test:gstlal-inspiral:conda
+    - test:gstlal-burst:conda
   before_script: [ ]
   script:
-    # add RPMs to directory to pass to docker
-    - mkdir rpms
+    # Set up directory structure and copy over built-dependencies from container:
+    - mkdir public
+    # Install RPMs and set up the test environment:
+    - source $CONDA_PREFIX/etc/profile.d/conda.sh
+    - conda activate gstlal-dev
+    - gst-inspect-1.0
 
-    # Copy rpms to new container.
-    - mv rpmbuild/RPMS/x86_64/*.rpm rpms
+    # Export variables for the offline tutorial
+    - export LAL_PATH=$CONDA_PREFIX
+    - export USER=gstlal_CI_test
 
-    # Clear out the old rpmbuild directory
-    - rm -rf rpmbuild*
+    # Get the necessary ROM data:
+    - git clone https://git.ligo.org/alexander.pace/gstlal-testing-data.git ${GSTLAL_DIR}/gstlal-testing-data
+    - export LAL_DATA_PATH=${GSTLAL_DIR}/gstlal-testing-data/
 
-    # Build the container:
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build --pull -t $DOCKER_BRANCH --file .gitlab-ci.Dockerfile.e7 .
-    - docker push $DOCKER_BRANCH
-  needs:
-    - level0:rpm:gstlal
-    - level1:rpm:gstlal-ugly
-    - level2:rpm:gstlal-calibration
-  only:
-    - /gstlal-calibration-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
+    - cd gstlal-inspiral/tests
+
+    # Run the makefile:
+    - make -f Makefile.offline_tutorial_test ENABLE_PLOTTING=0
 
-latest_image:
-  interruptible: true
-  stage: docker-latest
-  before_script: [ ]
-  needs:
-    - docker:release:gstlal-inspiral:el7
   only:
-    - /gstlal-inspiral-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
-  script:
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker tag $DOCKER_BRANCH $DOCKER_LATEST
-    - docker push $DOCKER_LATEST
-  retry:
-    max: 2
+    - schedules
+    - pushes
+  allow_failure: true
+
+# Documentation
 
 docs:
   interruptible: true

gstlal/pytest.ini

@@ -12,4 +12,5 @@ addopts =
     --ignore python/misc.py
     --ignore python/pipeline.py
     --ignore python/pipeparts/__init__.py
+    --ignore python/psd.py
     --ignore tests/tests_pytest/testtools.py

gstlal/share/conda/envs/base/gstlal-dev-linux-64.yml

@@ -3,6 +3,7 @@ channels:
 dependencies:
   - 'python > 3.6'
   - automake
+  - bc
   - c-compiler
   - cxx-compiler
   - doxygen
@@ -22,6 +23,8 @@ dependencies:
   - 'h5py < 3.0'
   - lalapps
   - ldas-tools-framecpp
+# Add back later for mkl linking
+#  - 'libblas=*=*mkl'
   - libframe
   - libtool
   - ligo-gracedb
@@ -29,6 +32,8 @@ dependencies:
   - ligo-segments
   - make
   - 'matplotlib-base < 3.0'
+#  add mkl back later
+#  - mkl-devel
   - myst-parser
   - nds2-client
   - 'numpy < 1.20'

gstlal/share/conda/envs/base/gstlal-prod-linux-64.yml

@@ -3,6 +3,7 @@ channels:
 dependencies:
   - 'python > 3.6'
   - automake
+  - bc
   - c-compiler
   - cxx-compiler
   - doxygen
@@ -11,7 +12,7 @@ dependencies:
   - gds-lsmp
   - gds-framexmit
   - gobject-introspection
-  - gsl
+  - 'gsl < 2.7'
   - gstreamer
   - gstreamer-orc
   - gst-python
@@ -21,6 +22,8 @@ dependencies:
   - 'h5py < 3.0'
   - lalapps
   - ldas-tools-framecpp
+# Add back later for mkl linking
+#  - 'libblas=*=*mkl'
   - libframe
   - libtool
   - ligo-gracedb
@@ -28,11 +31,14 @@ dependencies:
   - ligo-segments
   - make
   - 'matplotlib-base < 3.0'
+#  add mkl back later
+#  - mkl-devel
   - nds2-client
   - 'numpy < 1.20'
   - pandas
   - pkg-config
   - pluggy
+  - pydot
   - pyfftw
   - 'pygobject < 3.29'
   - python-avahi

gstlal/share/conda/envs/lock/gstlal-dev-linux-64.lock

 # Generated by conda-lock.
 # platform: linux-64
-# env_hash: e886f574d77aed062111a3cbc6fb5dbd2b556126aeffde8133ab5bb6c1b80c88
+# env_hash: 634492edbc436a3372743d746adad0abb313498ba7b27ec9576f94a935867f11
 @EXPLICIT
 https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
 https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2021.5.30-ha878542_0.tar.bz2#6a777890e94194dc94a29a76d2a7e721
@@ -25,10 +25,11 @@ https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#
 https://conda.anaconda.org/conda-forge/linux-64/binutils-2.36.1-hdd6e379_2.tar.bz2#3111f86041b5b6863545ca49130cca95
 https://conda.anaconda.org/conda-forge/linux-64/binutils_linux-64-2.36-hf3e587d_1.tar.bz2#7d750bafc3cc7121170387583ecf0ff1
 https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-11.2.0-h1d223b6_8.tar.bz2#2de68a054a079032d30dcd54ebf2ecb9
+https://conda.anaconda.org/conda-forge/linux-64/bc-1.07.1-h7f98852_0.tar.bz2#9ff50d162aa3b1c861fa30105bea1932
 https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h7f98852_4.tar.bz2#a1fd65c7ccbf10880423d82bca54eb54
 https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.17.2-h7f98852_0.tar.bz2#a25871010e5104556045aa01850fbddf
 https://conda.anaconda.org/conda-forge/linux-64/expat-2.4.1-h9c3ff4c_0.tar.bz2#16054ef3cb3ec5d8d29d08772662f65d
-https://conda.anaconda.org/conda-forge/linux-64/fftw-3.3.9-nompi_h74d3f13_101.tar.bz2#29215ded4cf637130a7674f2a6874922
+https://conda.anaconda.org/conda-forge/linux-64/fftw-3.3.10-nompi_hcdd671c_100.tar.bz2#59ab50acdfcae0c63a1b2adad1e7df1a
 https://conda.anaconda.org/conda-forge/linux-64/fribidi-1.0.10-h36c2ea0_0.tar.bz2#ac7bc6a654f8f41b352b38f4051135f8
 https://conda.anaconda.org/conda-forge/linux-64/giflib-5.2.1-h36c2ea0_2.tar.bz2#626e68ae9cc5912d6adb79d318cf962d
 https://conda.anaconda.org/conda-forge/linux-64/graphite2-1.3.13-h58526e2_1001.tar.bz2#8c54672728e8ec6aa6db90cf2806d220
@@ -81,7 +82,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.37-h21135ba_2.tar.bz2
 https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.10.0-ha56f1ee_0.tar.bz2#999b754fbf81618f1edadfb1204983a4
 https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.13-h7f98852_1003.tar.bz2#a9371e9e40aded194dcba1447606c9a1
 https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.9.10-h68273f3_2.tar.bz2#0315cae0468a1e17f1e7fad5b13d53f8
-https://conda.anaconda.org/conda-forge/linux-64/metaio-8.5.1-hed695b0_1001.tar.bz2#d76b603bc932e6dfa5280e3bf66c25c5
+https://conda.anaconda.org/conda-forge/linux-64/metaio-8.5.1-h27826a3_1001.tar.bz2#c15754332f225c5bf5ed67cd095e7048
 https://conda.anaconda.org/conda-forge/linux-64/munge-0.5.13-h1a52d62_0.tar.bz2#1b14fd235aa0f61fa02c0e66a75fed88
 https://conda.anaconda.org/conda-forge/linux-64/readline-8.1-h46c0cb4_0.tar.bz2#5788de3c8d7a7d64ac56c784c4ef48e6
 https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.11-h27826a3_1.tar.bz2#84e76fb280e735fec1efd2d21fd9cb27
@@ -188,9 +189,9 @@ https://conda.anaconda.org/conda-forge/linux-64/pillow-8.2.0-py37h4600e1f_1.tar.
 https://conda.anaconda.org/conda-forge/linux-64/pysocks-1.7.1-py37h89c1867_3.tar.bz2#bd069d59ee91a2e26552cd7bb4c64032
 https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
 https://conda.anaconda.org/conda-forge/linux-64/pyyaml-5.4.1-py37h5e8e339_1.tar.bz2#16757160a88eedbed94774e41189a729
-https://conda.anaconda.org/conda-forge/linux-64/setuptools-58.0.4-py37h89c1867_0.tar.bz2#cb198c0ec395b1b30ae3a045d62a1799
+https://conda.anaconda.org/conda-forge/linux-64/setuptools-58.0.4-py37h89c1867_1.tar.bz2#72b6136f590e535729a2268855636858
 https://conda.anaconda.org/conda-forge/linux-64/tornado-6.1-py37h5e8e339_1.tar.bz2#92449128c4639feae48d731ef2186099
-https://conda.anaconda.org/conda-forge/noarch/tqdm-4.62.2-pyhd8ed1ab_0.tar.bz2#129972a3ca8bb5abcf80f24ad2c12dae
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.62.3-pyhd8ed1ab_0.tar.bz2#24ed42db084efd6e615babec03c2b460
 https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.0.1-pyhd8ed1ab_0.tar.bz2#3b680fa0d39cccd009126087c6422fcc
 https://conda.anaconda.org/conda-forge/linux-64/boost-1.74.0-py37h6dcda5c_3.tar.bz2#9d0521327c82490693fc975239d475fa
 https://conda.anaconda.org/conda-forge/linux-64/brotlipy-0.7.0-py37h5e8e339_1001.tar.bz2#871eed4ba322e7b3f200956a096b34e7
@@ -244,11 +245,11 @@ https://conda.anaconda.org/conda-forge/linux-64/pygobject-3.28.3-py37h762b167_10
 https://conda.anaconda.org/conda-forge/linux-64/pytest-6.2.5-py37h89c1867_0.tar.bz2#64bc9e9fa6b4e9ea8e685e67ced6c8b0
 https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.6-pyhd8ed1ab_0.tar.bz2#dea5b6d93cfbfbc2a253168ad05b3f89
 https://conda.anaconda.org/conda-forge/linux-64/atk-2.36.0-ha770c72_4.tar.bz2#a880a89229c23d0c6aa99f1cc352d7a0
-https://conda.anaconda.org/conda-forge/noarch/botocore-1.21.42-pyhd8ed1ab_0.tar.bz2#6c968cf7de64ebc7b0076831ca541697
+https://conda.anaconda.org/conda-forge/noarch/botocore-1.21.44-pyhd8ed1ab_0.tar.bz2#03c80af259c7da01048dc1a46c6a0b9c
 https://conda.anaconda.org/conda-forge/linux-64/gst-python-1.18.2-py37he151c04_0.tar.bz2#fae86db5ef9a16d895dabc6501195018
 https://conda.anaconda.org/conda-forge/noarch/ligo-scald-0.7.2-py_0.tar.bz2#0f1c167739fadeafea75aefb9eab5743
 https://conda.anaconda.org/conda-forge/noarch/pytest-runner-5.3.1-pyhd8ed1ab_0.tar.bz2#746605234be5c988579ba312035c3959
-https://conda.anaconda.org/conda-forge/linux-64/python-avahi-0.8-py37hcbab0ec_0.tar.bz2#1a8590bf2e6e29fb1c3b39c1b0620970
+https://conda.anaconda.org/conda-forge/linux-64/python-avahi-0.8-py37hcbab0ec_1.tar.bz2#11b344a8d56b6f7d6c92b948ecce4eec
 https://conda.anaconda.org/conda-forge/noarch/requests-2.26.0-pyhd8ed1ab_0.tar.bz2#0ed2ccbde6db9dd5789068eb7194463f
 https://conda.anaconda.org/conda-forge/noarch/globus-sdk-1.11.0-pyhd8ed1ab_0.tar.bz2#6dce9d29e832e0ad7a9918e7034a6386
 https://conda.anaconda.org/conda-forge/linux-64/gtk2-2.24.32-h194ddfc_3.tar.bz2#21b006e3071f030d9393312b18631ab6
@@ -256,7 +257,7 @@ https://conda.anaconda.org/conda-forge/linux-64/healpy-1.15.0-py37hd0552aa_2.tar
 https://conda.anaconda.org/conda-forge/noarch/ligo-gracedb-2.7.6-pyhd8ed1ab_0.tar.bz2#774c36e2b7340c434e54973be68df379
 https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.5.0-pyhd8ed1ab_0.tar.bz2#5347ec6ef9835e820fe27bfa438ce8e9
 https://conda.anaconda.org/conda-forge/noarch/sphinx-2.4.4-py_0.tar.bz2#f030cbad068d10023baa6ef4fa71203d
-https://conda.anaconda.org/conda-forge/noarch/boto3-1.18.42-pyhd8ed1ab_0.tar.bz2#b54f09e2fb34ff8619bb4abacbb8ce9f
+https://conda.anaconda.org/conda-forge/noarch/boto3-1.18.44-pyhd8ed1ab_0.tar.bz2#205947f90283f8fcc685b04715ee1b24
 https://conda.anaconda.org/conda-forge/linux-64/graphviz-2.42.3-h6939c30_2.tar.bz2#fc2252c1502dd31f0b894dc3c69fdffd
 https://conda.anaconda.org/conda-forge/noarch/myst-parser-0.14.0-pyhd8ed1ab_0.tar.bz2#a3c98a24fd865ebdae41a143c1e1c155
 https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-1.0.0-pyhd8ed1ab_0.tar.bz2#9f633f2f2869184e31acfeae95b24345
@@ -270,7 +271,7 @@ https://conda.anaconda.org/conda-forge/linux-64/python-lalframe-1.5.5-py37hb1e94
 https://conda.anaconda.org/conda-forge/linux-64/python-lalmetaio-2.0.3-py37hb1e94ed_0.tar.bz2#78ae27a1fd4d0219eb09d5d27ccb8e00
 https://conda.anaconda.org/conda-forge/linux-64/python-lalpulsar-3.0.1-py37h902c9e0_0.tar.bz2#47149f57d5fd55abe76414e4a4350de7
 https://conda.anaconda.org/conda-forge/linux-64/python-lalsimulation-2.5.1-py37h902c9e0_0.tar.bz2#59633b937cf8fdadbfd58d9de11af1d1
-https://conda.anaconda.org/conda-forge/linux-64/python-ligo-lw-1.7.1-py37h5e8e339_0.tar.bz2#9e46fb819f9100d26f03faf48ca591d0
+https://conda.anaconda.org/conda-forge/linux-64/python-ligo-lw-1.7.1-py37h5e8e339_1.tar.bz2#1785b692eabfb41439396679705993e9
 https://conda.anaconda.org/conda-forge/linux-64/python-lalburst-1.5.8-py37h219ec46_0.tar.bz2#d9aa9564225a25024aeeae9bd05546e7
 https://conda.anaconda.org/conda-forge/linux-64/python-lalinspiral-2.0.2-py37h902c9e0_0.tar.bz2#d723641d9253139f4087aee929a388a7
 https://conda.anaconda.org/conda-forge/linux-64/python-lalinference-2.0.7-py37h902c9e0_0.tar.bz2#681043dcbf0b95c80a172c680e96ed75