Skip to content

Commit

Permalink
Merge pull request #229 from GeoStat-Framework/CIBW_cleanup
Browse files Browse the repository at this point in the history
CI: PIP_PREFER_BINARY=1 for CIBW; remove caps
  • Loading branch information
MuellerSeb authored Jan 20, 2022
2 parents 60a601d + 819b7d1 commit 41d80e2
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 32 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ gstools/_version.py
docs/source/examples/
docs/source/generated/


# other settings
.vscode/
*.DS_Store

*.zip
Expand Down
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
All notable changes to **GSTools** will be documented in this file.


## [1.3.5] - Pure Pink - ?
## [1.3.5] - Pure Pink - 2022-01

### Changes
- remove caps for dependencies [#229](https://github.com/GeoStat-Framework/GSTools/pull/229)
- build linux wheels with manylinux2014 for all versions ([CIBW v2.3.1](https://github.com/pypa/cibuildwheel/releases/tag/v2.3.1)) [#227](https://github.com/GeoStat-Framework/GSTools/pull/227)

### Bugfixes
- `Field.mesh` was not compatible with [meshio](https://github.com/nschloe/meshio) v5.1+ [#227](https://github.com/GeoStat-Framework/GSTools/pull/227)
Expand Down Expand Up @@ -327,7 +331,8 @@ See: [#197](https://github.com/GeoStat-Framework/GSTools/issues/197)
First release of GSTools.


[1.3.5]: https://github.com/GeoStat-Framework/gstools/compare/v1.3.4...HEAD
[Unreleased]: https://github.com/GeoStat-Framework/gstools/compare/v1.3.5...HEAD
[1.3.5]: https://github.com/GeoStat-Framework/gstools/compare/v1.3.4...v1.3.5
[1.3.4]: https://github.com/GeoStat-Framework/gstools/compare/v1.3.3...v1.3.4
[1.3.3]: https://github.com/GeoStat-Framework/gstools/compare/v1.3.2...v1.3.3
[1.3.2]: https://github.com/GeoStat-Framework/gstools/compare/v1.3.1...v1.3.2
Expand Down
28 changes: 17 additions & 11 deletions docs/source/_templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,24 @@
{{ super() }}
<br />
<p class="link caption"><span class="link caption-text">GSTools Links</span></p>
<a href="https://github.com/GeoStat-Framework/GSTools">GSTools GitHub</a>
<a href="https://zenodo.org/badge/latestdoi/117534635">GSTools Zenodo DOI</a>
<a href="https://pypi.org/project/gstools/">GSTools PyPI</a>
<ul>
<Li><a href="https://github.com/GeoStat-Framework/GSTools">GSTools GitHub</a></Li>
<Li><a href="https://zenodo.org/badge/latestdoi/117534635">GSTools Zenodo DOI</a></Li>
<Li><a href="https://pypi.org/project/gstools/">GSTools PyPI</a></Li>
</ul>
<br />
<p class="link caption"><span class="link caption-text">GeoStat Framework</span></p>
<a href="https://geostat-framework.org">GeoStat Website</a>
<a href="https://github.com/GeoStat-Framework">GeoStat Github</a>
<a href="https://github.com/GeoStat-Examples">GeoStat Examples</a>
<a href="https://geostat-framework.readthedocs.io">GeoStat ReadTheDocs</a>
<a href="https://pypi.org/user/geostatframework/">GeoStat PyPI</a>
<ul>
<Li><a href="https://geostat-framework.org">GeoStat Website</a></Li>
<Li><a href="https://github.com/GeoStat-Framework">GeoStat Github</a></Li>
<Li><a href="https://github.com/GeoStat-Examples">GeoStat Examples</a></Li>
<Li><a href="https://geostat-framework.readthedocs.io">GeoStat ReadTheDocs</a></Li>
<Li><a href="https://pypi.org/user/geostatframework/">GeoStat PyPI</a></Li>
</ul>
<br />
<br />
<a href="genindex.html">Index</a>
<a href="contents.html">Sitemap</a>
{% endblock %}
<ul>
<Li><a href="genindex.html">Index</a></Li>
<Li><a href="contents.html">Sitemap</a></Li>
</ul>
{% endblock %}
7 changes: 2 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,5 @@ test-extras = "test"
test-command = "pytest -v {package}/tests"
# Skip trying to test arm64 builds on Intel Macs
test-skip = "*-macosx_arm64 *-macosx_universal2:arm64"

[[tool.cibuildwheel.overrides]]
select = "*manylinux_i686"
# no wheels for 32 bit anymore
before-test = "pip install 'numpy<1.22'"
# no wheels for linux-32bit anymore for numpy>=1.22
environment = "PIP_PREFER_BINARY=1"
24 changes: 11 additions & 13 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,19 @@ exclude =

[options.extras_require]
doc =
m2r2>=0.2.8,<1
matplotlib>=3,<4
meshzoo>=0.7,<1
numpydoc>=1.1,<2
m2r2>=0.2.8
matplotlib>=3
meshzoo>=0.7
numpydoc>=1.1
pykrige>=1.5,<2
pyvista>=0.31,<1
sphinx>=3,<4
sphinx-gallery>=0.8,<1
sphinx-rtd-theme>=0.5,<1
pyvista>=0.29
sphinx>=4
sphinx-gallery>=0.8
sphinx-rtd-theme>=1
plotting =
matplotlib>=3,<4
pyvista>=0.29,<1
matplotlib>=3
pyvista>=0.29
rust =
gstools_core>=0.2.0,<1
test =
coverage[toml]>=5.2.1,<6
pytest>=6.0,<7
pytest-cov>=2.11.0,<3
pytest-cov>=3

0 comments on commit 41d80e2

Please sign in to comment.