From 8c6651eaef7ffa6dce57f4171c9a420c425c0810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20M=C3=BCller?= Date: Sat, 15 Jan 2022 17:36:27 +0100 Subject: [PATCH 1/6] CI: PIP_PREFER_BINARY=1 to prevent building deps --- pyproject.toml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4846554b..488a001a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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" From 40aee6811eef83a7bf3bd1b5b6d23cbf1b6191d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20M=C3=BCller?= Date: Sat, 15 Jan 2022 18:28:12 +0100 Subject: [PATCH 2/6] Remove caps; pytest-cov already has all test deps --- setup.cfg | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/setup.cfg b/setup.cfg index 711a3a03..c2f206ff 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 From b493cb8d04fdacc326ad60f8ad2796a5b52b3a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20M=C3=BCller?= Date: Sun, 16 Jan 2022 00:36:13 +0100 Subject: [PATCH 3/6] Doc: need to stick to sphinx-rtd-theme<1 See: https://github.com/readthedocs/sphinx_rtd_theme/issues/1278 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index c2f206ff..d86b11d0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -71,7 +71,7 @@ doc = pyvista>=0.29 sphinx>=4 sphinx-gallery>=0.8 - sphinx-rtd-theme>=1 + sphinx-rtd-theme<1 plotting = matplotlib>=3 pyvista>=0.29 From 5036a36b7036c6bb2bab5eef5fd2bad10db63b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20M=C3=BCller?= Date: Thu, 20 Jan 2022 12:50:54 +0100 Subject: [PATCH 4/6] Sphinx RTD theme v1: apply fix from https://github.com/readthedocs/sphinx_rtd_theme/issues/1278 --- docs/source/_templates/layout.html | 28 +++++++++++++++++----------- setup.cfg | 2 +- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/docs/source/_templates/layout.html b/docs/source/_templates/layout.html index f5a6014e..e2649c4b 100644 --- a/docs/source/_templates/layout.html +++ b/docs/source/_templates/layout.html @@ -4,18 +4,24 @@ {{ super() }}

GSTools Links

- GSTools GitHub - GSTools Zenodo DOI - GSTools PyPI +

GeoStat Framework

- GeoStat Website - GeoStat Github - GeoStat Examples - GeoStat ReadTheDocs - GeoStat PyPI +

- Index - Sitemap - {% endblock %} + + {% endblock %} diff --git a/setup.cfg b/setup.cfg index d86b11d0..c2f206ff 100644 --- a/setup.cfg +++ b/setup.cfg @@ -71,7 +71,7 @@ doc = pyvista>=0.29 sphinx>=4 sphinx-gallery>=0.8 - sphinx-rtd-theme<1 + sphinx-rtd-theme>=1 plotting = matplotlib>=3 pyvista>=0.29 From e52041c89b96f1809bb94ca21659e32163a45651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20M=C3=BCller?= Date: Thu, 20 Jan 2022 12:51:15 +0100 Subject: [PATCH 5/6] ignore vscode settings --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ac070f57..1ff77bf2 100644 --- a/.gitignore +++ b/.gitignore @@ -118,7 +118,8 @@ gstools/_version.py docs/source/examples/ docs/source/generated/ - +# other settings +.vscode/ *.DS_Store *.zip From 819b7d1a39b2ca37f6d8d64856b372ba8758926a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20M=C3=BCller?= Date: Thu, 20 Jan 2022 13:12:22 +0100 Subject: [PATCH 6/6] update changelog for v1.3.5 --- CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 850dd2e0..05a3f622 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) @@ -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