Skip to content

Commit 41d80e2

Browse files
authored
Merge pull request #229 from GeoStat-Framework/CIBW_cleanup
CI: PIP_PREFER_BINARY=1 for CIBW; remove caps
2 parents 60a601d + 819b7d1 commit 41d80e2

File tree

5 files changed

+39
-32
lines changed

5 files changed

+39
-32
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ gstools/_version.py
118118
docs/source/examples/
119119
docs/source/generated/
120120

121-
121+
# other settings
122+
.vscode/
122123
*.DS_Store
123124

124125
*.zip

CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
All notable changes to **GSTools** will be documented in this file.
44

55

6-
## [1.3.5] - Pure Pink - ?
6+
## [1.3.5] - Pure Pink - 2022-01
7+
8+
### Changes
9+
- remove caps for dependencies [#229](https://github.com/GeoStat-Framework/GSTools/pull/229)
10+
- 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)
711

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

329333

330-
[1.3.5]: https://github.com/GeoStat-Framework/gstools/compare/v1.3.4...HEAD
334+
[Unreleased]: https://github.com/GeoStat-Framework/gstools/compare/v1.3.5...HEAD
335+
[1.3.5]: https://github.com/GeoStat-Framework/gstools/compare/v1.3.4...v1.3.5
331336
[1.3.4]: https://github.com/GeoStat-Framework/gstools/compare/v1.3.3...v1.3.4
332337
[1.3.3]: https://github.com/GeoStat-Framework/gstools/compare/v1.3.2...v1.3.3
333338
[1.3.2]: https://github.com/GeoStat-Framework/gstools/compare/v1.3.1...v1.3.2

docs/source/_templates/layout.html

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,24 @@
44
{{ super() }}
55
<br />
66
<p class="link caption"><span class="link caption-text">GSTools Links</span></p>
7-
<a href="https://github.com/GeoStat-Framework/GSTools">GSTools GitHub</a>
8-
<a href="https://zenodo.org/badge/latestdoi/117534635">GSTools Zenodo DOI</a>
9-
<a href="https://pypi.org/project/gstools/">GSTools PyPI</a>
7+
<ul>
8+
<Li><a href="https://github.com/GeoStat-Framework/GSTools">GSTools GitHub</a></Li>
9+
<Li><a href="https://zenodo.org/badge/latestdoi/117534635">GSTools Zenodo DOI</a></Li>
10+
<Li><a href="https://pypi.org/project/gstools/">GSTools PyPI</a></Li>
11+
</ul>
1012
<br />
1113
<p class="link caption"><span class="link caption-text">GeoStat Framework</span></p>
12-
<a href="https://geostat-framework.org">GeoStat Website</a>
13-
<a href="https://github.com/GeoStat-Framework">GeoStat Github</a>
14-
<a href="https://github.com/GeoStat-Examples">GeoStat Examples</a>
15-
<a href="https://geostat-framework.readthedocs.io">GeoStat ReadTheDocs</a>
16-
<a href="https://pypi.org/user/geostatframework/">GeoStat PyPI</a>
14+
<ul>
15+
<Li><a href="https://geostat-framework.org">GeoStat Website</a></Li>
16+
<Li><a href="https://github.com/GeoStat-Framework">GeoStat Github</a></Li>
17+
<Li><a href="https://github.com/GeoStat-Examples">GeoStat Examples</a></Li>
18+
<Li><a href="https://geostat-framework.readthedocs.io">GeoStat ReadTheDocs</a></Li>
19+
<Li><a href="https://pypi.org/user/geostatframework/">GeoStat PyPI</a></Li>
20+
</ul>
1721
<br />
1822
<br />
19-
<a href="genindex.html">Index</a>
20-
<a href="contents.html">Sitemap</a>
21-
{% endblock %}
23+
<ul>
24+
<Li><a href="genindex.html">Index</a></Li>
25+
<Li><a href="contents.html">Sitemap</a></Li>
26+
</ul>
27+
{% endblock %}

pyproject.toml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,5 @@ test-extras = "test"
7979
test-command = "pytest -v {package}/tests"
8080
# Skip trying to test arm64 builds on Intel Macs
8181
test-skip = "*-macosx_arm64 *-macosx_universal2:arm64"
82-
83-
[[tool.cibuildwheel.overrides]]
84-
select = "*manylinux_i686"
85-
# no wheels for 32 bit anymore
86-
before-test = "pip install 'numpy<1.22'"
82+
# no wheels for linux-32bit anymore for numpy>=1.22
83+
environment = "PIP_PREFER_BINARY=1"

setup.cfg

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,19 @@ exclude =
6363

6464
[options.extras_require]
6565
doc =
66-
m2r2>=0.2.8,<1
67-
matplotlib>=3,<4
68-
meshzoo>=0.7,<1
69-
numpydoc>=1.1,<2
66+
m2r2>=0.2.8
67+
matplotlib>=3
68+
meshzoo>=0.7
69+
numpydoc>=1.1
7070
pykrige>=1.5,<2
71-
pyvista>=0.31,<1
72-
sphinx>=3,<4
73-
sphinx-gallery>=0.8,<1
74-
sphinx-rtd-theme>=0.5,<1
71+
pyvista>=0.29
72+
sphinx>=4
73+
sphinx-gallery>=0.8
74+
sphinx-rtd-theme>=1
7575
plotting =
76-
matplotlib>=3,<4
77-
pyvista>=0.29,<1
76+
matplotlib>=3
77+
pyvista>=0.29
7878
rust =
7979
gstools_core>=0.2.0,<1
8080
test =
81-
coverage[toml]>=5.2.1,<6
82-
pytest>=6.0,<7
83-
pytest-cov>=2.11.0,<3
81+
pytest-cov>=3

0 commit comments

Comments
 (0)