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.

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

Develop to main for 2024.12.12 #181

Merged
merged 58 commits into from
Dec 13, 2024
Merged

Develop to main for 2024.12.12 #181

merged 58 commits into from
Dec 13, 2024

Conversation

brtietz
Copy link
Collaborator

@brtietz brtietz commented Dec 13, 2024

No description provided.

brtietz and others added 30 commits December 13, 2023 09:46
* Merge in patch branch and re-target develop

* add windows build

* windows ci

* windows

* windows

* fix paths

* windows lk

* debug

* check python

* python version

* try downloading wx

* update linux

* linux

* fix syntax

* download wx

* add secrets

* tokens

* download_wx

* download_wx

* token

* msg

* fix

* cache build off

* windows

* add mac build

* fix dirs

* fix mac

* pip on mac

* pip

* mac

* fix git ls-remote

* fix mac

* mac

* update all

* windows secrets

* fix paths

* add error message

* build lk always

* fix paths

* fix paths

* fix paths

* windows

* move windows download

* clean up and fix artifacts

* use caches

* windows cache

* fix caching

* fix paths for artifacts

* fix caching path

* fix caching

* get branch name

* cleanup

* fix ssc cache

* fix windows

* use caching for wx 3.2.4

* release mode

* release ver

* fix windows path

* remove download_wx.py

* add default branch

* debug vs rel for MSVC

* select branch based on push or pull_request

---------

Co-authored-by: Brian Mirletz <brian.mirletz@nrel.gov>
Update to minimum MacOS version 12 per SAM #1745
sjanzou and others added 28 commits July 24, 2024 02:25
Existing user and new user and resend key tested
Addresses SAM issue 486 - merging with dependent approved SAM pull request 1821
Windows runner fix - dependencies for lk and ssc set to patch
Update library calls to std:: namespace per SAM issue 1224
* Ci runners (#169)

* Merge in patch branch and re-target develop

* add windows build

* windows ci

* windows

* windows

* fix paths

* windows lk

* debug

* check python

* python version

* try downloading wx

* update linux

* linux

* fix syntax

* download wx

* add secrets

* tokens

* download_wx

* download_wx

* token

* msg

* fix

* cache build off

* windows

* add mac build

* fix dirs

* fix mac

* pip on mac

* pip

* mac

* fix git ls-remote

* fix mac

* mac

* update all

* windows secrets

* fix paths

* add error message

* build lk always

* fix paths

* fix paths

* fix paths

* windows

* move windows download

* clean up and fix artifacts

* use caches

* windows cache

* fix caching

* fix paths for artifacts

* fix caching path

* fix caching

* get branch name

* cleanup

* fix ssc cache

* fix windows

* use caching for wx 3.2.4

* release mode

* release ver

* fix windows path

* remove download_wx.py

* add default branch

* debug vs rel for MSVC

* select branch based on push or pull_request

---------

Co-authored-by: Brian Mirletz <brian.mirletz@nrel.gov>

* shell

* fix

* fix windows

* windows

---------

Co-authored-by: Brian Mirletz <brian.mirletz@nrel.gov>
Remove FOSSA license scan and Travis-CI from readme
Address SAM issue 289 - ignore leap years in timeseries axis
with min rather than min+1 to not draw entire background as min
Change mask color for nan/inf values to light grey for contour plots

Merging to go out in the beta release!
@brtietz brtietz merged commit 574f6fa into main Dec 13, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants