Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the override paths when running in github actions #3045

Merged
merged 3 commits into from
Nov 27, 2023
Merged

Fix the override paths when running in github actions #3045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0733dd
Fix the override paths when running in github actions.
rousik Nov 14, 2023
a3f7ec7
Merge branch 'dev' into fix-conftest-bug
rousik Nov 26, 2023
8f0f51c
Update conda-lock.yml and rendered conda environment files.
rousik Nov 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion environments/conda-linux-64.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions environments/conda-lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5164,32 +5164,32 @@ 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
version: "0.83"
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
version: "0.83"
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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion environments/conda-osx-64.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion environments/conda-osx-arm64.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
zaneselvans marked this conversation as resolved.
Show resolved Hide resolved
logger.info(
"Running in GitHub Actions environment, using"
f" temporary input dir: {gha_override_input}, and"
Expand Down
Loading