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

Update develop with master branch changes #139

Merged
merged 31 commits into from
Jul 10, 2024
Merged

Update develop with master branch changes #139

merged 31 commits into from
Jul 10, 2024

Commits on Jul 3, 2024

  1. Configuration menu
    Copy the full SHA
    e9cb034 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3e2a944 View commit details
    Browse the repository at this point in the history
  3. Actions: Pin numpy version on conda install

    Numpy 2.0 could be cause of this error:
    
    ```
     Error using _pocketfft><module>
          Python Error: ImportError:
          /opt/hostedtoolcache/MATLAB/2022.2.999/x64/interprocess/bin/glnxa64/pycli/../../../../sys/os/glnxa64/libstdc++.so.6:
          version `GLIBCXX_3.4.29' not found (required by
          /home/runner/miniconda3/envs/mhkit_conda_env/lib/python3.10/site-packages/numpy/fft/_pocketfft_umath.cpython-310-x86_64-linux-gnu.so)
    ```
    simmsa committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    a51ab5c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4c0f968 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f962753 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6316bb4 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    20073f3 View commit details
    Browse the repository at this point in the history
  8. Actions: Use older pinned numpy version

    ```
    Could not solve for environment specs
    The following packages are incompatible
    ├─ numpy 1.26.4  is installable with the potential options
    │  ├─ numpy 1.26.4 would require
    │  │  └─ python >=3.10,<3.11.0a0 , which can be installed;
    │  ├─ numpy 1.26.4 would require
    │  │  └─ python >=3.11,<3.12.0a0 , which can be installed;
    │  ├─ numpy 1.26.4 would require
    │  │  └─ python >=3.12,<3.13.0a0 , which can be installed;
    │  └─ numpy 1.26.4 would require
    │     └─ python >=3.9,<3.10.0a0 , which can be installed;
    └─ pin-1 is not installable because it requires
       └─ python 3.8.* , which conflicts with any installable versions previously reported.
    
    Pins seem to be involved in the conflict. Currently pinned specs:
     - python 3.8.* (labeled as 'pin-1')
    ```
    simmsa committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    7affff0 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    cdac403 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    c6db258 View commit details
    Browse the repository at this point in the history
  11. Actions: Reduce scipy pinned version number to 1.11.4

    ```
    LibMambaUnsatisfiableError: Encountered problems while solving:
      - package scipy-1.12.0-py310hdfaad59_0 requires python >=3.10,<3.11.0a0, but none of the providers can be installed
    
    Could not solve for environment specs
    The following packages are incompatible
    ├─ pin-1 is installable and it requires
    │  └─ python 3.8.* , which can be installed;
    └─ scipy 1.12.0  is not installable because there are no viable options
       ├─ scipy 1.12.0 would require
       │  └─ python >=3.10,<3.11.0a0 , which conflicts with any installable versions previously reported;
       ├─ scipy 1.12.0 would require
       │  └─ python >=3.11,<3.12.0a0 , which conflicts with any installable versions previously reported;
       ├─ scipy 1.12.0 would require
       │  └─ python >=3.12,<3.13.0a0 , which conflicts with any installable versions previously reported;
       └─ scipy 1.12.0 would require
          └─ python >=3.9,<3.10.0a0 , which conflicts with any installable versions previously reported.
    ```
    simmsa committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    cfb4928 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    b01d9a6 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    f10720d View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    345ef8b View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    b9eabb5 View commit details
    Browse the repository at this point in the history
  16. Docs: Add changelog.md

    Use this for documenting release notes and changes between versions
    simmsa committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    90b1462 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    bec4393 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    9051573 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    25fa191 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Configuration menu
    Copy the full SHA
    cdda295 View commit details
    Browse the repository at this point in the history
  2. Ignore: Remove original ignores

    These items are not project specific
    simmsa committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    d2ab7e2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1c23988 View commit details
    Browse the repository at this point in the history
  4. Ignore: Python defaults

    simmsa committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    84f7313 View commit details
    Browse the repository at this point in the history
  5. Ignore: MacOS Defaults

    simmsa committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    74052a2 View commit details
    Browse the repository at this point in the history
  6. Docs: Update test matricies for MacOS

    All tests are passing on MacOS.
    simmsa committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    750a4a4 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    899da29 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    ac5be59 View commit details
    Browse the repository at this point in the history
  9. Docs: Remove MacOS failing test details

    This test is no longer failing in this way.
    simmsa committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    270868f View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    7ff8586 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Fix: Update toolbox binary with proper paths

    The toolbox is dependent on adding mhkit to the path when building the
    binary. This build adds the path correction to the project file and the
    associated binary toolbox file.
    simmsa committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    84aec54 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e780f1c View commit details
    Browse the repository at this point in the history