diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 6a7c590cde..0938e2171e 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} diff --git a/HISTORY.rst b/HISTORY.rst index 8c25b710dd..6867043406 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -32,9 +32,11 @@ .. :changelog: +Unreleased Changes +------------------ -Unreleased Changes (3.10) -------------------------- +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. diff --git a/Makefile b/Makefile index 9848956fbb..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 := 034ac3c6362b563989ec6b8dcd9d6fc4f582c911 +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 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 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