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

Conversation

simmsa
Copy link
Contributor

@simmsa simmsa commented Jul 9, 2024

Some changes were missed in the v0.5.0 release. This updates develop to include changes in the master branch.

simmsa added 30 commits July 3, 2024 15:57
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)
```
```
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')
```
```
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.
```
Use this for documenting release notes and changes between versions
These items are not project specific
All tests are passing on MacOS.
This test is no longer failing in this way.
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 simmsa marked this pull request as ready for review July 10, 2024 13:50
@simmsa simmsa requested a review from hivanov-nrel July 10, 2024 13:50
@simmsa simmsa merged commit 9e155d6 into develop Jul 10, 2024
136 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.

2 participants