forked from NREL/ROSCO
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into usflowt
- Loading branch information
Showing
193 changed files
with
22,755 additions
and
18,183 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| --- | ||
| name: Bug report | ||
| about: Create a report to help us improve | ||
| title: '' | ||
| labels: '' | ||
| assignees: '' | ||
|
|
||
| --- | ||
|
|
||
| ## Desired use case | ||
| _If you are able, please provide some background about your ROSCO use case. It helps guide our development and could help us better fix your issue._ | ||
|
|
||
| ## Description | ||
| _Describe the bug here_ | ||
|
|
||
| ### Steps to reproduce issue | ||
| _Please provide a minimum working example (MWE) if possible_ | ||
|
|
||
| 1. … | ||
| 2. … | ||
| 3. … | ||
|
|
||
| ### Current behavior | ||
| … | ||
|
|
||
| ### Expected behavior | ||
| … | ||
|
|
||
|
|
||
| ### Code versions | ||
| _List versions only if relevant_ | ||
| - Python | ||
| - … |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| --- | ||
| name: Feature request | ||
| about: Suggest an idea for this project | ||
| title: '' | ||
| labels: '' | ||
| assignees: '' | ||
|
|
||
| --- | ||
|
|
||
| # Description of feature | ||
| Describe the feature here and provide some context. Under what scenario would this be useful? | ||
|
|
||
| # Potential solution | ||
| Can you think of ways to implement this? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -e | ||
| set -x | ||
|
|
||
| WHEEL=$1 | ||
| DEST_DIR=$2 | ||
|
|
||
| python -m pip install delvewheel | ||
| python -m delvewheel show "$WHEEL" && python -m delvewheel repair -w "$DEST_DIR" "$WHEEL" --no-mangle-all |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,24 +16,61 @@ jobs: | |
| strategy: | ||
| fail-fast: false #true | ||
| matrix: | ||
| os: ["ubuntu-latest", "macOS-latest", "windows-latest"] | ||
| python-version: ["3.9", "3.10", "3.11"] | ||
| os: ["ubuntu-latest", "macOS-latest", "windows-latest"] #mac-13 intel, mac-14 arm | ||
| python-version: ["3.9", "3.10", "3.11", "3.12"] | ||
|
|
||
| steps: | ||
| - name: Setup GNU Fortran | ||
| # if: false == contains( matrix.os, 'windows') | ||
| uses: awvwgk/setup-fortran@v1 #modflowpy/install-intelfortran-action@v1 # | ||
| if: false == contains( matrix.os, 'windows') | ||
| uses: fortran-lang/[email protected] | ||
| # with: | ||
| # compiler: intel-classic | ||
|
|
||
| - name: Install compiler | ||
| if: false == contains( matrix.os, 'windows') | ||
| id: install_cc | ||
| uses: rlalik/setup-cpp-compiler@master | ||
| with: | ||
| compiler: clang | ||
|
|
||
| - name: Install mingw-w64 on Windows | ||
| if: contains( matrix.os, 'windows') | ||
| uses: msys2/setup-msys2@v2 | ||
| with: | ||
| path-type: inherit | ||
| install: | | ||
| mingw-w64-x86_64-gcc | ||
| mingw-w64-x86_64-gcc-fortran | ||
| mingw-w64-x86_64-zeromq | ||
| mingw-w64-x86_64-cmake | ||
| mingw-w64-x86_64-pkg-config | ||
| - name: Install zeromq ubuntu | ||
| if: contains( matrix.os, 'ubuntu') | ||
| run: | | ||
| sudo apt install libzmq3-dev libzmq5 libczmq-dev libczmq4 | ||
| - name: Install zeromq mac | ||
| if: contains( matrix.os, 'mac') | ||
| run: | | ||
| brew install zeromq | ||
| - name: checkout repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v4 | ||
| uses: actions/setup-python@v5 | ||
| id: cp | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| update-environment: true | ||
|
|
||
| - name: Set compilers | ||
| if: false == contains( matrix.os, 'windows') | ||
| run: | | ||
| echo "CC=${{ steps.install_cc.outputs.cc }}" >> $GITHUB_ENV | ||
| echo "CXX=${{ steps.install_cc.outputs.cxx }}" >> $GITHUB_ENV | ||
| #- name: Setup tmate session | ||
| # if: contains( matrix.os, 'windows') | ||
| # uses: mxschmitt/action-tmate@v3 | ||
|
|
@@ -71,8 +108,8 @@ jobs: | |
| strategy: | ||
| fail-fast: false #true | ||
| matrix: | ||
| os: ["ubuntu-latest", "macOS-latest", "windows-latest"] | ||
| python-version: ["3.9", "3.10", "3.11"] | ||
| os: ["ubuntu-latest", "macOS-13", "windows-latest"] #mac-13 intel, mac-14 arm | ||
| python-version: ["3.9", "3.10", "3.11", "3.12"] | ||
|
|
||
| steps: | ||
| - name: checkout repository | ||
|
|
@@ -113,13 +150,7 @@ jobs: | |
| - name: Install OpenFAST | ||
| run: | | ||
| conda install openfast==3.5.2 | ||
| #- name: Check OpenFAST | ||
| # # if: contains( matrix.os, 'windows') | ||
| # run: | | ||
| # openfast -v | ||
| # which openfast | ||
| conda install openfast==3.5.3 | ||
| - name: Generate Registry | ||
| run: | | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,96 @@ | ||
| name: Build and upload to PyPI | ||
| # https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml | ||
| # Best comparable example: https://github.com/pdfo/pdfo | ||
|
|
||
| # Build on every branch push, tag push, and pull request change: | ||
| #on: [push, pull_request] | ||
| # Alternatively, to publish when a (published) GitHub Release is created, use the following: | ||
| on: | ||
| release: | ||
| types: | ||
| - published | ||
| # Build on every pull request (no need for every push) and release change: | ||
| on: [pull_request, release] | ||
|
|
||
| jobs: | ||
| build_wheels: | ||
| name: Build wheels on ${{ matrix.os }} | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| os: [ubuntu-latest, windows-latest, macos-latest] | ||
| os: [ubuntu-latest, windows-latest, macos-12, macos-13, macos-14] | ||
|
|
||
| steps: | ||
| - name: Set up QEMU | ||
| if: runner.os == 'Linux' | ||
| uses: docker/setup-qemu-action@v3 | ||
| with: | ||
| platforms: all | ||
|
|
||
| - name: Setup GNU Fortran | ||
| if: false == contains( matrix.os, 'windows') | ||
| uses: awvwgk/setup-fortran@v1 | ||
|
|
||
| - name: Install compiler | ||
| if: false == contains( matrix.os, 'windows') | ||
| id: install_cc | ||
| uses: rlalik/setup-cpp-compiler@master | ||
| with: | ||
| compiler: clang | ||
|
|
||
| - name: Install mingw-w64 on Windows | ||
| if: contains( matrix.os, 'windows') | ||
| uses: msys2/setup-msys2@v2 | ||
| with: | ||
| path-type: inherit | ||
| install: | | ||
| mingw-w64-x86_64-gcc | ||
| mingw-w64-x86_64-gcc-fortran | ||
| mingw-w64-x86_64-zeromq | ||
| mingw-w64-x86_64-cmake | ||
| mingw-w64-x86_64-pkg-config | ||
| - name: Install zeromq ubuntu | ||
| if: contains( matrix.os, 'ubuntu') | ||
| run: | | ||
| sudo apt install libzmq3-dev libzmq5 libczmq-dev libczmq4 | ||
| - name: Install zeromq mac | ||
| if: contains( matrix.os, 'mac') | ||
| run: | | ||
| brew install zeromq | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Build wheels | ||
| uses: pypa/[email protected] | ||
| - name: Build wheels linux | ||
| if: contains( matrix.os, 'ubuntu') | ||
| uses: pypa/[email protected] | ||
| env: | ||
| CC: ${{ steps.install_cc.outputs.cc }} | ||
| CXX: ${{ steps.install_cc.outputs.cxx }} | ||
|
|
||
| - name: Build wheels mac-12 | ||
| if: contains( matrix.os, 'macos-12') | ||
| uses: pypa/[email protected] | ||
| env: | ||
| CC: ${{ steps.install_cc.outputs.cc }} | ||
| CXX: ${{ steps.install_cc.outputs.cxx }} | ||
| CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET="12.0" | ||
|
|
||
| - name: Build wheels mac-13 | ||
| if: contains( matrix.os, 'macos-13') | ||
| uses: pypa/[email protected] | ||
| env: | ||
| CC: ${{ steps.install_cc.outputs.cc }} | ||
| CXX: ${{ steps.install_cc.outputs.cxx }} | ||
| CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET="13.0" | ||
|
|
||
| - name: Build wheels mac-14 | ||
| if: contains( matrix.os, 'macos-14') | ||
| uses: pypa/[email protected] | ||
| env: | ||
| CC: ${{ steps.install_cc.outputs.cc }} | ||
| CXX: ${{ steps.install_cc.outputs.cxx }} | ||
| CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET="14.0" | ||
|
|
||
| - name: Build wheels windows | ||
| if: contains( matrix.os, 'windows') | ||
| uses: pypa/[email protected] | ||
|
|
||
| - uses: actions/upload-artifact@v4 | ||
| with: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.