From 153947229c63c1143634536ef2e873f008622b28 Mon Sep 17 00:00:00 2001 From: Santiago Monserrat Campanello Date: Mon, 1 Jul 2024 17:58:36 -0300 Subject: [PATCH 01/10] =?UTF-8?q?change=20FireTemp=20to=20use=20correct=20?= =?UTF-8?q?C=C2=B0=20range=20for=20red=20chanell?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- goes2go/rgb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/goes2go/rgb.py b/goes2go/rgb.py index 71bb0a1..7f66f68 100644 --- a/goes2go/rgb.py +++ b/goes2go/rgb.py @@ -513,7 +513,7 @@ def FireTemperature(C, **kwargs): R, G, B = load_RGB_channels(C, (7, 6, 5)) # Normalize each channel by the appropriate range of values (clipping happens in function) - R = normalize(R, 273, 333) + R = normalize(R, 0, 60) G = normalize(G, 0, 1) B = normalize(B, 0, 0.75) From 1078f75b6862ab8589ca19f51adc7a725ede1179 Mon Sep 17 00:00:00 2001 From: Brian Blaylock Date: Sat, 6 Jul 2024 14:06:07 -0700 Subject: [PATCH 02/10] Fix FireTemperature R in accessor, too --- goes2go/accessors.py | 146 +++++++++++++++++++++---------------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/goes2go/accessors.py b/goes2go/accessors.py index 7e6e460..f7b8a76 100644 --- a/goes2go/accessors.py +++ b/goes2go/accessors.py @@ -346,8 +346,8 @@ def get_latlon(self): def _load_RGB_channels(self, channels): """Load the specified RGB channels. - Return the R, G, and B arrays for the three channels requested. This - function will convert the data any units in Kelvin to Celsius. + Return the R, G, and B arrays for the three channels requested. + This function convert any data given in Kelvin to Celsius. Parameters ---------- @@ -368,7 +368,7 @@ def _load_RGB_channels(self, channels): RGB = [] for u, c in zip(units, channels): if u == "K": - # Convert form Kelvin to Celsius ## <-- Do I REALLY want to hard-code this in? + # Convert form Kelvin to Celsius RGB.append(ds["CMI_C%02d" % c].data - 273.15) else: RGB.append(ds["CMI_C%02d" % c].data) @@ -449,9 +449,9 @@ def TrueColor(self, gamma=2.2, pseudoGreen=True, night_IR=True): ds["TrueColor"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["TrueColor"].attrs[ - "Quick Guide" - ] = "http://cimss.ssec.wisc.edu/goes/OCLOFactSheetPDFs/ABIQuickGuide_CIMSSRGB_v2.pdf" + ds["TrueColor"].attrs["Quick Guide"] = ( + "http://cimss.ssec.wisc.edu/goes/OCLOFactSheetPDFs/ABIQuickGuide_CIMSSRGB_v2.pdf" + ) ds["TrueColor"].attrs["long_name"] = "True Color" return ds["TrueColor"] @@ -554,9 +554,9 @@ def breakpoint_stretch(C, breakpoint): ds["NaturalColor"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["NaturalColor"].attrs[ - "Quick Guide" - ] = "http://cimss.ssec.wisc.edu/goes/OCLOFactSheetPDFs/ABIQuickGuide_CIMSSRGB_v2.pdf" + ds["NaturalColor"].attrs["Quick Guide"] = ( + "http://cimss.ssec.wisc.edu/goes/OCLOFactSheetPDFs/ABIQuickGuide_CIMSSRGB_v2.pdf" + ) ds["NaturalColor"].attrs["long_name"] = "Natural Color" return ds["NaturalColor"] @@ -576,7 +576,7 @@ def FireTemperature(self): R, G, B = self._load_RGB_channels((7, 6, 5)) # _normalize each channel by the appropriate range of values (clipping happens in function) - R = _normalize(R, 273, 333) + R = _normalize(R, 0, 60) G = _normalize(G, 0, 1) B = _normalize(B, 0, 0.75) @@ -590,9 +590,9 @@ def FireTemperature(self): ds["FireTemperature"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["FireTemperature"].attrs[ - "Quick Guide" - ] = "http://rammb.cira.colostate.edu/training/visit/quick_guides/Fire_Temperature_RGB.pdf" + ds["FireTemperature"].attrs["Quick Guide"] = ( + "http://rammb.cira.colostate.edu/training/visit/quick_guides/Fire_Temperature_RGB.pdf" + ) ds["FireTemperature"].attrs["long_name"] = "Fire Temperature" return ds["FireTemperature"] @@ -626,9 +626,9 @@ def AirMass(self): ds["AirMass"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["AirMass"].attrs[ - "Quick Guide" - ] = "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_GOESR_AirMassRGB_final.pdf" + ds["AirMass"].attrs["Quick Guide"] = ( + "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_GOESR_AirMassRGB_final.pdf" + ) ds["AirMass"].attrs["long_name"] = "Air Mass" return ds["AirMass"] @@ -667,9 +667,9 @@ def AirMassTropical(self): ds["AirMassTropical"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["AirMassTropical"].attrs[ - "Quick Guide" - ] = "https://www.eumetsat.int/media/43301" + ds["AirMassTropical"].attrs["Quick Guide"] = ( + "https://www.eumetsat.int/media/43301" + ) ds["AirMassTropical"].attrs["long_name"] = "Air Mass Tropical" return ds["AirMassTropical"] @@ -702,9 +702,9 @@ def AirMassTropicalPac(self): ds["AirMassTropicalPac"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["AirMassTropicalPac"].attrs[ - "Quick Guide" - ] = "https://cimss.ssec.wisc.edu/satellite-blog/archives/51777" + ds["AirMassTropicalPac"].attrs["Quick Guide"] = ( + "https://cimss.ssec.wisc.edu/satellite-blog/archives/51777" + ) ds["AirMassTropicalPac"].attrs["long_name"] = "Air Mass Tropical Pac" return ds["AirMassTropicalPac"] @@ -736,9 +736,9 @@ def DayCloudPhase(self): ds["DayCloudPhase"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["DayCloudPhase"].attrs[ - "Quick Guide" - ] = "http://rammb.cira.colostate.edu/training/visit/quick_guides/Day_Cloud_Phase_Distinction.pdf" + ds["DayCloudPhase"].attrs["Quick Guide"] = ( + "http://rammb.cira.colostate.edu/training/visit/quick_guides/Day_Cloud_Phase_Distinction.pdf" + ) ds["DayCloudPhase"].attrs["long_name"] = "Day Cloud Phase" return ds["DayCloudPhase"] @@ -770,9 +770,9 @@ def DayConvection(self): ds["DayConvection"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["DayConvection"].attrs[ - "Quick Guide" - ] = "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_GOESR_DayConvectionRGB_final.pdf" + ds["DayConvection"].attrs["Quick Guide"] = ( + "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_GOESR_DayConvectionRGB_final.pdf" + ) ds["DayConvection"].attrs["long_name"] = "Day Convection" return ds["DayConvection"] @@ -809,9 +809,9 @@ def DayCloudConvection(self): ds["DayCloudConvection"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["DayCloudConvection"].attrs[ - "Quick Guide" - ] = "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_DayCloudConvectionRGB_final.pdf" + ds["DayCloudConvection"].attrs["Quick Guide"] = ( + "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_DayCloudConvectionRGB_final.pdf" + ) ds["DayCloudConvection"].attrs["long_name"] = "Day Cloud Convection" return ds["DayCloudConvection"] @@ -840,9 +840,9 @@ def DayLandCloud(self): ds["DayLandCloud"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["DayLandCloud"].attrs[ - "Quick Guide" - ] = "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_GOESR_daylandcloudRGB_final.pdf" + ds["DayLandCloud"].attrs["Quick Guide"] = ( + "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_GOESR_daylandcloudRGB_final.pdf" + ) ds["DayLandCloud"].attrs["long_name"] = "Day Land Cloud" return ds["DayLandCloud"] @@ -871,9 +871,9 @@ def DayLandCloudFire(self): ds["DayLandCloudFire"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["DayLandCloudFire"].attrs[ - "Quick Guide" - ] = "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_GOESR_DayLandCloudFireRGB_final.pdf" + ds["DayLandCloudFire"].attrs["Quick Guide"] = ( + "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_GOESR_DayLandCloudFireRGB_final.pdf" + ) ds["DayLandCloudFire"].attrs["long_name"] = "Day Land Cloud Fire" return ds["DayLandCloudFire"] @@ -907,9 +907,9 @@ def WaterVapor(self): ds["WaterVapor"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["WaterVapor"].attrs[ - "Quick Guide" - ] = "http://rammb.cira.colostate.edu/training/visit/quick_guides/Simple_Water_Vapor_RGB.pdf" + ds["WaterVapor"].attrs["Quick Guide"] = ( + "http://rammb.cira.colostate.edu/training/visit/quick_guides/Simple_Water_Vapor_RGB.pdf" + ) ds["WaterVapor"].attrs["long_name"] = "Water Vapor" return ds["WaterVapor"] @@ -950,9 +950,9 @@ def DifferentialWaterVapor(self): ds["DifferentialWaterVapor"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["DifferentialWaterVapor"].attrs[ - "Quick Guide" - ] = "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_GOESR_DifferentialWaterVaporRGB_final.pdf" + ds["DifferentialWaterVapor"].attrs["Quick Guide"] = ( + "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_GOESR_DifferentialWaterVaporRGB_final.pdf" + ) ds["DifferentialWaterVapor"].attrs["long_name"] = "Differential Water Vapor" return ds["DifferentialWaterVapor"] @@ -989,9 +989,9 @@ def DaySnowFog(self): ds["DaySnowFog"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["DaySnowFog"].attrs[ - "Quick Guide" - ] = "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_DaySnowFog.pdf" + ds["DaySnowFog"].attrs["Quick Guide"] = ( + "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_DaySnowFog.pdf" + ) ds["DaySnowFog"].attrs["long_name"] = "Day Snow Fog" return ds["DaySnowFog"] @@ -1022,9 +1022,9 @@ def NighttimeMicrophysics(self): ds["NighttimeMicrophysics"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["NighttimeMicrophysics"].attrs[ - "Quick Guide" - ] = "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_GOESR_NtMicroRGB_final.pdf" + ds["NighttimeMicrophysics"].attrs["Quick Guide"] = ( + "http://rammb.cira.colostate.edu/training/visit/quick_guides/QuickGuide_GOESR_NtMicroRGB_final.pdf" + ) ds["NighttimeMicrophysics"].attrs["long_name"] = "Nighttime Microphysics" return ds["NighttimeMicrophysics"] @@ -1059,9 +1059,9 @@ def Dust(self): ds["Dust"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["Dust"].attrs[ - "Quick Guide" - ] = "http://rammb.cira.colostate.edu/training/visit/quick_guides/Dust_RGB_Quick_Guide.pdf" + ds["Dust"].attrs["Quick Guide"] = ( + "http://rammb.cira.colostate.edu/training/visit/quick_guides/Dust_RGB_Quick_Guide.pdf" + ) ds["Dust"].attrs["long_name"] = "Dust" return ds["Dust"] @@ -1092,9 +1092,9 @@ def SulfurDioxide(self): ds["SulfurDioxide"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["SulfurDioxide"].attrs[ - "Quick Guide" - ] = "http://rammb.cira.colostate.edu/training/visit/quick_guides/Quick_Guide_SO2_RGB.pdf" + ds["SulfurDioxide"].attrs["Quick Guide"] = ( + "http://rammb.cira.colostate.edu/training/visit/quick_guides/Quick_Guide_SO2_RGB.pdf" + ) ds["SulfurDioxide"].attrs["long_name"] = "Sulfur Dioxide" return ds["SulfurDioxide"] @@ -1125,9 +1125,9 @@ def Ash(self): ds["Ash"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["Ash"].attrs[ - "Quick Guide" - ] = "http://rammb.cira.colostate.edu/training/visit/quick_guides/GOES_Ash_RGB.pdf" + ds["Ash"].attrs["Quick Guide"] = ( + "http://rammb.cira.colostate.edu/training/visit/quick_guides/GOES_Ash_RGB.pdf" + ) ds["Ash"].attrs["long_name"] = "Ash" return ds["Ash"] @@ -1154,9 +1154,9 @@ def SplitWindowDifference(self): ds["SplitWindowDifference"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["SplitWindowDifference"].attrs[ - "Quick Guide" - ] = "http://cimss.ssec.wisc.edu/goes/OCLOFactSheetPDFs/ABIQuickGuide_SplitWindowDifference.pdf" + ds["SplitWindowDifference"].attrs["Quick Guide"] = ( + "http://cimss.ssec.wisc.edu/goes/OCLOFactSheetPDFs/ABIQuickGuide_SplitWindowDifference.pdf" + ) ds["SplitWindowDifference"].attrs["long_name"] = "Split Window Difference" return ds["SplitWindowDifference"] @@ -1186,9 +1186,9 @@ def NightFogDifference(self): ds["NightFogDifference"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["NightFogDifference"].attrs[ - "Quick Guide" - ] = "http://cimss.ssec.wisc.edu/goes/OCLOFactSheetPDFs/ABIQuickGuide_NightFogBTD.pdf" + ds["NightFogDifference"].attrs["Quick Guide"] = ( + "http://cimss.ssec.wisc.edu/goes/OCLOFactSheetPDFs/ABIQuickGuide_NightFogBTD.pdf" + ) ds["NightFogDifference"].attrs["long_name"] = "NightFogDifference" return ds["NightFogDifference"] @@ -1232,9 +1232,9 @@ def RocketPlume(self, night=False): ds["RocketPlume"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["RocketPlume"].attrs[ - "Quick Guide" - ] = "https://cimss.ssec.wisc.edu/satellite-blog/images/2021/06/QuickGuide_Template_GOESRBanner_Rocket_Plume.pdf" + ds["RocketPlume"].attrs["Quick Guide"] = ( + "https://cimss.ssec.wisc.edu/satellite-blog/images/2021/06/QuickGuide_Template_GOESRBanner_Rocket_Plume.pdf" + ) ds["RocketPlume"].attrs["long_name"] = "Rocket Plume" return ds["RocketPlume"] @@ -1268,9 +1268,9 @@ def NormalizedBurnRatio(self): ds["NormalizedBurnRatio"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["NormalizedBurnRatio"].attrs[ - "Quick Guide" - ] = "https://ntrs.nasa.gov/citations/20190030825" + ds["NormalizedBurnRatio"].attrs["Quick Guide"] = ( + "https://ntrs.nasa.gov/citations/20190030825" + ) ds["NormalizedBurnRatio"].attrs["long_name"] = "Normalized Burn Ratio" return ds["NormalizedBurnRatio"] @@ -1305,9 +1305,9 @@ def SeaSpray(self, **kwargs): ds["SeaSpray"] = (("y", "x", "rgb"), RGB) ds["rgb"] = ["R", "G", "B"] - ds["SeaSpray"].attrs[ - "Quick Guide" - ] = "https://rammb.cira.colostate.edu/training/visit/quick_guides/VIIRS_Sea_Spray_RGB_Quick_Guide_v2.pdf" + ds["SeaSpray"].attrs["Quick Guide"] = ( + "https://rammb.cira.colostate.edu/training/visit/quick_guides/VIIRS_Sea_Spray_RGB_Quick_Guide_v2.pdf" + ) ds["SeaSpray"].attrs["long_name"] = "Sea Spray" return ds["SeaSpray"] From 768aab70c40e6e52bad2caf3e6a626e6d6168b8a Mon Sep 17 00:00:00 2001 From: Brian Blaylock Date: Sat, 6 Jul 2024 14:11:47 -0700 Subject: [PATCH 03/10] fix tests for macOS (I think this will work for now) --- .github/workflows/tests-python.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests-python.yml b/.github/workflows/tests-python.yml index 5342c85..371f1b0 100644 --- a/.github/workflows/tests-python.yml +++ b/.github/workflows/tests-python.yml @@ -26,9 +26,9 @@ jobs: # matrix slots on other OS than Linux. include: - os: "macos-latest" - python-version: "3.11" + python-version: "3.12" - os: "windows-latest" - python-version: "3.11" + python-version: "3.12" env: OS: ${{ matrix.os }} @@ -53,7 +53,20 @@ jobs: cache: "pip" cache-dependency-path: "setup.cfg" - - name: Install project + - name: Install project (Linux) + if: runner.os == 'Linux' + run: | + pip3 install --requirement=requirements-test.txt + pip3 install --editable=. + + - name: Install project (macOS) + if: runner == "macOS" + run: | + pip3 install --break-system-packages --requirement=requirements-test.txt + pip3 install --break-system-packages --editable=. + + - name: Install project (Windows) + if: runner == "Windows" run: | pip3 install --requirement=requirements-test.txt pip3 install --editable=. From f5b269540c6019a6bb5fe4008386a07936412059 Mon Sep 17 00:00:00 2001 From: Brian Blaylock Date: Sat, 6 Jul 2024 14:18:16 -0700 Subject: [PATCH 04/10] fix tests syntax --- .github/workflows/tests-python.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests-python.yml b/.github/workflows/tests-python.yml index 371f1b0..48956c4 100644 --- a/.github/workflows/tests-python.yml +++ b/.github/workflows/tests-python.yml @@ -54,19 +54,19 @@ jobs: cache-dependency-path: "setup.cfg" - name: Install project (Linux) - if: runner.os == 'Linux' + if: ${{ runner.os }} == 'Linux' run: | pip3 install --requirement=requirements-test.txt pip3 install --editable=. - name: Install project (macOS) - if: runner == "macOS" + if: ${{ runner.os }} == "macOS" run: | pip3 install --break-system-packages --requirement=requirements-test.txt pip3 install --break-system-packages --editable=. - name: Install project (Windows) - if: runner == "Windows" + if: ${{ runner.os }} == "Windows" run: | pip3 install --requirement=requirements-test.txt pip3 install --editable=. From aff791a78e753441667994149f8ada7584ca91cc Mon Sep 17 00:00:00 2001 From: Brian Blaylock Date: Sat, 6 Jul 2024 14:21:41 -0700 Subject: [PATCH 05/10] third time's a charm. Haha --- .github/workflows/tests-python.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests-python.yml b/.github/workflows/tests-python.yml index 48956c4..46ca228 100644 --- a/.github/workflows/tests-python.yml +++ b/.github/workflows/tests-python.yml @@ -54,19 +54,19 @@ jobs: cache-dependency-path: "setup.cfg" - name: Install project (Linux) - if: ${{ runner.os }} == 'Linux' + if: runner.os == 'Linux' run: | pip3 install --requirement=requirements-test.txt pip3 install --editable=. - name: Install project (macOS) - if: ${{ runner.os }} == "macOS" + if: runner.os == "macOS" run: | pip3 install --break-system-packages --requirement=requirements-test.txt pip3 install --break-system-packages --editable=. - name: Install project (Windows) - if: ${{ runner.os }} == "Windows" + if: runner.os == "Windows" run: | pip3 install --requirement=requirements-test.txt pip3 install --editable=. From 4b00c5708e825fc58f9f88ee84feb0b003e83b23 Mon Sep 17 00:00:00 2001 From: Brian Blaylock Date: Sat, 6 Jul 2024 14:25:39 -0700 Subject: [PATCH 06/10] gosh, I'm struggling with this workflow --- .github/workflows/tests-python.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests-python.yml b/.github/workflows/tests-python.yml index 46ca228..8b0742b 100644 --- a/.github/workflows/tests-python.yml +++ b/.github/workflows/tests-python.yml @@ -18,17 +18,17 @@ jobs: tests: runs-on: ${{ matrix.os }} strategy: - fail-fast: true + fail-fast: false matrix: os: ["ubuntu-latest"] python-version: ["3.9", "3.10", "3.11", "3.12"] # In order to save resources, only run particular # matrix slots on other OS than Linux. - include: - - os: "macos-latest" - python-version: "3.12" - - os: "windows-latest" - python-version: "3.12" + #include: + # - os: "macos-latest" + # python-version: "3.12" + # - os: "windows-latest" + # python-version: "3.12" env: OS: ${{ matrix.os }} From d6e0412d3ae422332e6db1a0b31644682d17d60a Mon Sep 17 00:00:00 2001 From: Brian Blaylock Date: Sat, 6 Jul 2024 14:26:27 -0700 Subject: [PATCH 07/10] still messing with GitHub workflow --- .github/workflows/tests-python.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests-python.yml b/.github/workflows/tests-python.yml index 8b0742b..07787bb 100644 --- a/.github/workflows/tests-python.yml +++ b/.github/workflows/tests-python.yml @@ -54,22 +54,22 @@ jobs: cache-dependency-path: "setup.cfg" - name: Install project (Linux) - if: runner.os == 'Linux' + if: ${{ runner.os }} == 'Linux' run: | pip3 install --requirement=requirements-test.txt pip3 install --editable=. - - name: Install project (macOS) - if: runner.os == "macOS" - run: | - pip3 install --break-system-packages --requirement=requirements-test.txt - pip3 install --break-system-packages --editable=. - - - name: Install project (Windows) - if: runner.os == "Windows" - run: | - pip3 install --requirement=requirements-test.txt - pip3 install --editable=. + #- name: Install project (macOS) + # if: runner.os == "macOS" + # run: | + # pip3 install --break-system-packages --requirement=requirements-test.txt + # pip3 install --break-system-packages --editable=. +# + #- name: Install project (Windows) + # if: runner.os == "Windows" + # run: | + # pip3 install --requirement=requirements-test.txt + # pip3 install --editable=. - name: Run tests env: From 9061d876f7d2cf2e02e83f0e8f9f2e4f21eba2c7 Mon Sep 17 00:00:00 2001 From: Brian Blaylock Date: Sat, 6 Jul 2024 14:29:04 -0700 Subject: [PATCH 08/10] add back in windows tests --- .github/workflows/tests-python.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests-python.yml b/.github/workflows/tests-python.yml index 07787bb..461dd3b 100644 --- a/.github/workflows/tests-python.yml +++ b/.github/workflows/tests-python.yml @@ -24,11 +24,11 @@ jobs: python-version: ["3.9", "3.10", "3.11", "3.12"] # In order to save resources, only run particular # matrix slots on other OS than Linux. - #include: + include: # - os: "macos-latest" # python-version: "3.12" - # - os: "windows-latest" - # python-version: "3.12" + - os: "windows-latest" + python-version: "3.12" env: OS: ${{ matrix.os }} @@ -64,12 +64,12 @@ jobs: # run: | # pip3 install --break-system-packages --requirement=requirements-test.txt # pip3 install --break-system-packages --editable=. -# - #- name: Install project (Windows) - # if: runner.os == "Windows" - # run: | - # pip3 install --requirement=requirements-test.txt - # pip3 install --editable=. + # + - name: Install project (Windows) + if: ${{ runner.os }} == "Windows" + run: | + pip3 install --requirement=requirements-test.txt + pip3 install --editable=. - name: Run tests env: From f0eb058bc5e688c6f22af7c66f446bba8af8132c Mon Sep 17 00:00:00 2001 From: Brian Blaylock Date: Sat, 6 Jul 2024 14:33:02 -0700 Subject: [PATCH 09/10] try again --- .github/workflows/tests-python.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests-python.yml b/.github/workflows/tests-python.yml index 461dd3b..93de26b 100644 --- a/.github/workflows/tests-python.yml +++ b/.github/workflows/tests-python.yml @@ -54,7 +54,7 @@ jobs: cache-dependency-path: "setup.cfg" - name: Install project (Linux) - if: ${{ runner.os }} == 'Linux' + if: runner.os == 'Linux' run: | pip3 install --requirement=requirements-test.txt pip3 install --editable=. @@ -66,7 +66,7 @@ jobs: # pip3 install --break-system-packages --editable=. # - name: Install project (Windows) - if: ${{ runner.os }} == "Windows" + if: runner.os == 'Windows' run: | pip3 install --requirement=requirements-test.txt pip3 install --editable=. From 7fa36dae8b3e5ea869ac7201d68dfa146c5478ae Mon Sep 17 00:00:00 2001 From: Brian Blaylock Date: Sat, 6 Jul 2024 14:35:12 -0700 Subject: [PATCH 10/10] add back in macOS --- .github/workflows/tests-python.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests-python.yml b/.github/workflows/tests-python.yml index 93de26b..440b0e0 100644 --- a/.github/workflows/tests-python.yml +++ b/.github/workflows/tests-python.yml @@ -25,8 +25,8 @@ jobs: # In order to save resources, only run particular # matrix slots on other OS than Linux. include: - # - os: "macos-latest" - # python-version: "3.12" + - os: "macos-latest" + python-version: "3.12" - os: "windows-latest" python-version: "3.12" @@ -59,12 +59,12 @@ jobs: pip3 install --requirement=requirements-test.txt pip3 install --editable=. - #- name: Install project (macOS) - # if: runner.os == "macOS" - # run: | - # pip3 install --break-system-packages --requirement=requirements-test.txt - # pip3 install --break-system-packages --editable=. - # + - name: Install project (macOS) + if: runner.os == 'macOS' + run: | + pip3 install --break-system-packages --requirement=requirements-test.txt + pip3 install --break-system-packages --editable=. + - name: Install project (Windows) if: runner.os == 'Windows' run: |