From 053f21ce540eb09051976f0362f0a9cc2e13bab6 Mon Sep 17 00:00:00 2001 From: davemfish Date: Thu, 16 Dec 2021 13:11:48 -0500 Subject: [PATCH 01/10] added release date to HISTORY. #784. --- HISTORY.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index cae488bc98..a7397dc565 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -32,9 +32,11 @@ .. :changelog: +Unreleased Changes +------------------ -Unreleased Changes (3.10) -------------------------- +3.10 (2021-12-16) +----------------- * General * Add a ``--language`` argument to the command-line interface, which will translate model names, specs, and validation messages. From bcd7ef58e905bce804d3e20ae2c2c6ef54196be2 Mon Sep 17 00:00:00 2001 From: davemfish Date: Mon, 3 Jan 2022 09:00:10 -0500 Subject: [PATCH 02/10] updated sampledata rev after fixing a gpkg. #784. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9848956fbb..facdc926c0 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ DATA_DIR := data GIT_SAMPLE_DATA_REPO := https://bitbucket.org/natcap/invest-sample-data.git GIT_SAMPLE_DATA_REPO_PATH := $(DATA_DIR)/invest-sample-data -GIT_SAMPLE_DATA_REPO_REV := 034ac3c6362b563989ec6b8dcd9d6fc4f582c911 +GIT_SAMPLE_DATA_REPO_REV := 71608c1bbec138ff48d6814955b6ab947a8f288d GIT_TEST_DATA_REPO := https://bitbucket.org/natcap/invest-test-data.git GIT_TEST_DATA_REPO_PATH := $(DATA_DIR)/invest-test-data From 5bfea9b0b35dea37432ac3f64baedd88cda24050 Mon Sep 17 00:00:00 2001 From: davemfish Date: Mon, 3 Jan 2022 13:31:27 -0500 Subject: [PATCH 03/10] updated the sampledata rev again, following a merge commit. #784. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index facdc926c0..c4b95236fb 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ DATA_DIR := data GIT_SAMPLE_DATA_REPO := https://bitbucket.org/natcap/invest-sample-data.git GIT_SAMPLE_DATA_REPO_PATH := $(DATA_DIR)/invest-sample-data -GIT_SAMPLE_DATA_REPO_REV := 71608c1bbec138ff48d6814955b6ab947a8f288d +GIT_SAMPLE_DATA_REPO_REV := d143dc9bcf9ee2def7edb285d98e8a9743091fd5 GIT_TEST_DATA_REPO := https://bitbucket.org/natcap/invest-test-data.git GIT_TEST_DATA_REPO_PATH := $(DATA_DIR)/invest-test-data From df2e3cbf2b5aa2112a548b270e95eaf87f39686a Mon Sep 17 00:00:00 2001 From: davemfish Date: Mon, 3 Jan 2022 14:44:13 -0500 Subject: [PATCH 04/10] restrict numpy version until there is a compatible pyinstaller release. #784. --- pyproject.toml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 17c484f1cd..12cb66f03e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ # will dynamically import GDAL via python's import system. This behavior means # that we can provide a much easier build experience so long as GDAL is # available at runtime. -requires = ['setuptools>=45', 'wheel', 'setuptools_scm>=6.2', 'numpy', 'cython', 'babel'] +requires = ['setuptools>=45', 'wheel', 'setuptools_scm>=6.2', 'numpy<1.22.0', 'cython', 'babel'] [tool.setuptools_scm] version_scheme = "post-release" diff --git a/requirements.txt b/requirements.txt index 53be702758..766aee54c8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ GDAL>=3.1.2,!=3.3.0 # 3.3.0 had a bug that broke our windows builds: https://github.com/OSGeo/gdal/issues/3898 Pyro4==4.77 # pip-only pandas>=1.2.1 -numpy>=1.11.0,!=1.16.0 +numpy>=1.11.0,!=1.16.0,<1.22.0 Rtree>=0.8.2,!=0.9.1 Shapely>=1.7.1,<2.0.0 scipy>=1.6.0 # pip-only From 9b98e4a011ba909692baa072e96b7b0857bbcf39 Mon Sep 17 00:00:00 2001 From: davemfish Date: Mon, 3 Jan 2022 19:55:43 -0500 Subject: [PATCH 05/10] specifying a python version for a build step that is failing to build a wheel. --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 6a7c590cde..6cb87cee82 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -307,7 +307,7 @@ jobs: fail-fast: False max-parallel: 4 matrix: - python-version: [3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9.7] python-architecture: [x64] os: [windows-latest] From f71af7de2827e6dc66521446514b78e387fccbcd Mon Sep 17 00:00:00 2001 From: davemfish Date: Tue, 4 Jan 2022 08:53:01 -0500 Subject: [PATCH 06/10] remove nsis installation from our workflow; it's available already on GHA. --- ci/windows-ci-binary-install.ps1 | 8 -------- installer/windows/invest_installer.nsi | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ci/windows-ci-binary-install.ps1 b/ci/windows-ci-binary-install.ps1 index 05a8730042..d0dda1f9a9 100644 --- a/ci/windows-ci-binary-install.ps1 +++ b/ci/windows-ci-binary-install.ps1 @@ -17,14 +17,6 @@ $env:PATH += ";C:\ProgramData\chocolatey\bin" # Choco-provided command to reload environment variables refreshenv -# Install NSIS. The choco-provided NSIS puts it somewhere else and -# the choco CLI option --install-directory isn't available in the OSS -# version of choco. -Invoke-WebRequest https://iweb.dl.sourceforge.net/project/nsis/NSIS%203/3.05/nsis-3.05-setup.exe -OutFile nsis.exe - -# See http://www.silentinstall.org/nsis for flags used. -& nsis.exe /SD /D="C:\Program Files (x86)\NSIS" - # Download and install NSIS plugins to their correct places. Write-Host "Downloading and extracting NSIS" Invoke-WebRequest https://storage.googleapis.com/natcap-build-dependencies/windows/Inetc.zip -OutFile Inetc.zip diff --git a/installer/windows/invest_installer.nsi b/installer/windows/invest_installer.nsi index c61fe30ab1..a8e5e5cdd5 100644 --- a/installer/windows/invest_installer.nsi +++ b/installer/windows/invest_installer.nsi @@ -101,6 +101,7 @@ OutFile ..\..\dist\InVEST_${FORKNAME}${VERSION}_${ARCHITECTURE}_Setup.exe ShowInstDetails show BrandingText "2021 ${PRODUCT_PUBLISHER}" SetCompressor zlib +Unicode false ; Include after SetCompressor !include Utils.nsh From 826e36aeeed2f70a4a4f5d7683194b2ad5d76488 Mon Sep 17 00:00:00 2001 From: davemfish Date: Tue, 4 Jan 2022 10:26:20 -0500 Subject: [PATCH 07/10] replace 'make install' with a command that seems to work. --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 6cb87cee82..b4f3bbbf83 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -348,7 +348,7 @@ jobs: requirements.txt requirements-dev.txt \ requirements-gui.txt > requirements-all.yml conda env update --file requirements-all.yml - make install + python -m pip install . - name: Run UI tests shell: bash -l {0} From 17ef78235e8d6b1d1d9a1d25c92a30b63e0ee544 Mon Sep 17 00:00:00 2001 From: davemfish Date: Tue, 4 Jan 2022 10:54:05 -0500 Subject: [PATCH 08/10] reverted change to python version in test matrix. --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index b4f3bbbf83..0938e2171e 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -307,7 +307,7 @@ jobs: fail-fast: False max-parallel: 4 matrix: - python-version: [3.7, 3.8, 3.9.7] + python-version: [3.7, 3.8, 3.9] python-architecture: [x64] os: [windows-latest] From 5c0a409380754f6c54cabb3ba64bc8aee541df70 Mon Sep 17 00:00:00 2001 From: davemfish Date: Tue, 4 Jan 2022 14:21:58 -0500 Subject: [PATCH 09/10] updated release data in HISTORY. --- HISTORY.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 3e9578c1f4..99bbe336f8 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -35,7 +35,7 @@ Unreleased Changes ------------------ -3.10 (2021-12-16) +3.10 (2022-01-04) ----------------- * General * Add a ``--language`` argument to the command-line interface, which will From 86a698468dcaff3c3670101f0acf89e9889cb581 Mon Sep 17 00:00:00 2001 From: davemfish Date: Tue, 4 Jan 2022 15:34:45 -0500 Subject: [PATCH 10/10] minor change in history. --- HISTORY.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 99bbe336f8..6867043406 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -35,8 +35,8 @@ Unreleased Changes ------------------ -3.10 (2022-01-04) ------------------ +3.10.0 (2022-01-04) +------------------- * General * Add a ``--language`` argument to the command-line interface, which will translate model names, specs, and validation messages.