diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index f0f30381d5..e2e68c6c70 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -11,7 +11,7 @@ dependencies: - font-ttf-dejavu-sans-mono=2.37=hab24e00_0 - font-ttf-inconsolata=3.000=h77eed37_0 - font-ttf-source-code-pro=2.038=h77eed37_0 - - font-ttf-ubuntu=0.83=hab24e00_0 + - font-ttf-ubuntu=0.83=h77eed37_1 - ld_impl_linux-64=2.40=h41732ed_0 - libboost-headers=1.83.0=ha770c72_0 - libstdcxx-ng=13.2.0=h7e041cc_3 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 44de324243..1f01523d08 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -5164,10 +5164,10 @@ package: manager: conda platform: linux-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-h77eed37_1.conda hash: - md5: 19410c3df09dfb12d1206132a1d357c5 - sha256: 470d5db54102bd51dbb0c5990324a2f4a0bc976faa493b22193338adb9882e2e + md5: 6185f640c43843e5ad6fd1c5372c3f80 + sha256: 056c85b482d58faab5fd4670b6c1f5df0986314cca3bc831d458b22e4ef2c792 category: main optional: false - name: font-ttf-ubuntu @@ -5175,10 +5175,10 @@ package: manager: conda platform: osx-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-h77eed37_1.conda hash: - md5: 19410c3df09dfb12d1206132a1d357c5 - sha256: 470d5db54102bd51dbb0c5990324a2f4a0bc976faa493b22193338adb9882e2e + md5: 6185f640c43843e5ad6fd1c5372c3f80 + sha256: 056c85b482d58faab5fd4670b6c1f5df0986314cca3bc831d458b22e4ef2c792 category: main optional: false - name: font-ttf-ubuntu @@ -5186,10 +5186,10 @@ package: manager: conda platform: osx-arm64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-h77eed37_1.conda hash: - md5: 19410c3df09dfb12d1206132a1d357c5 - sha256: 470d5db54102bd51dbb0c5990324a2f4a0bc976faa493b22193338adb9882e2e + md5: 6185f640c43843e5ad6fd1c5372c3f80 + sha256: 056c85b482d58faab5fd4670b6c1f5df0986314cca3bc831d458b22e4ef2c792 category: main optional: false - name: fontconfig @@ -5294,8 +5294,8 @@ package: dependencies: font-ttf-inconsolata: "" font-ttf-source-code-pro: "" - font-ttf-dejavu-sans-mono: "" font-ttf-ubuntu: "" + font-ttf-dejavu-sans-mono: "" url: https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2 hash: md5: f766549260d6815b0c52253f1fb1bb29 @@ -5309,8 +5309,8 @@ package: dependencies: font-ttf-inconsolata: "" font-ttf-source-code-pro: "" - font-ttf-dejavu-sans-mono: "" font-ttf-ubuntu: "" + font-ttf-dejavu-sans-mono: "" url: https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2 hash: md5: f766549260d6815b0c52253f1fb1bb29 diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index 341cba76ed..7f51df9f80 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -13,7 +13,7 @@ dependencies: - font-ttf-dejavu-sans-mono=2.37=hab24e00_0 - font-ttf-inconsolata=3.000=h77eed37_0 - font-ttf-source-code-pro=2.038=h77eed37_0 - - font-ttf-ubuntu=0.83=hab24e00_0 + - font-ttf-ubuntu=0.83=h77eed37_1 - fribidi=1.0.10=hbcb3906_0 - giflib=5.2.1=hb7f2c08_3 - icu=73.2=hf5e326d_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index a641f4d001..2172ab7c8e 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -13,7 +13,7 @@ dependencies: - font-ttf-dejavu-sans-mono=2.37=hab24e00_0 - font-ttf-inconsolata=3.000=h77eed37_0 - font-ttf-source-code-pro=2.038=h77eed37_0 - - font-ttf-ubuntu=0.83=hab24e00_0 + - font-ttf-ubuntu=0.83=h77eed37_1 - fribidi=1.0.10=h27ca646_0 - giflib=5.2.1=h1a8c8d9_3 - icu=73.2=hc8870d7_0 diff --git a/test/conftest.py b/test/conftest.py index 14aef3e05b..63bad24bb9 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -323,8 +323,8 @@ def configure_paths_for_tests(tmp_path_factory, request): gha_override_input = False gha_override_output = False if os.environ.get("GITHUB_ACTIONS", False): - gha_override_input = "PUDL_INPUTS" not in os.environ - gha_override_output = "PUDL_OUTPUTS" not in os.environ + gha_override_input = "PUDL_INPUT" not in os.environ + gha_override_output = "PUDL_OUTPUT" not in os.environ logger.info( "Running in GitHub Actions environment, using" f" temporary input dir: {gha_override_input}, and"