From b7b443ec81d45c7f8cbc73e4394abbffe8552742 Mon Sep 17 00:00:00 2001 From: James Douglass Date: Fri, 17 Mar 2023 11:38:14 -0700 Subject: [PATCH 1/3] Updating HISTORY for the 3.13.0 release. RE:1255 --- HISTORY.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 0c82de3e0d..0fca9db486 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -35,8 +35,8 @@ .. :changelog: -Unreleased Changes ------------------- +3.13.0 (2023-03-17) +------------------- * General * During builds of the InVEST documentation, the packages ``sphinx-rtd-theme`` and ``sphinx-reredirects`` will be pulled from From 1458d071db3cc1772af9b2a6c9a21f7ce83a057e Mon Sep 17 00:00:00 2001 From: James Douglass Date: Fri, 17 Mar 2023 11:41:57 -0700 Subject: [PATCH 2/3] Updating UG and test data repo revs for the release. RE:#1255 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b2f72a15b9..e101c6cd83 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,11 @@ GIT_SAMPLE_DATA_REPO_REV := 5992790e63a5b906aa126cd5d72f019a985925e3 GIT_TEST_DATA_REPO := https://bitbucket.org/natcap/invest-test-data.git GIT_TEST_DATA_REPO_PATH := $(DATA_DIR)/invest-test-data -GIT_TEST_DATA_REPO_REV := 29d8da596ff197d3cc6e355e7cd4313945b89b71 +GIT_TEST_DATA_REPO_REV := a89253d83d5f70a8ea2d8a951b2d47d603505f14 GIT_UG_REPO := https://github.com/natcap/invest.users-guide GIT_UG_REPO_PATH := doc/users-guide -GIT_UG_REPO_REV := 49fcb5b30b0f0336e932e6e32e662284a3e711af +GIT_UG_REPO_REV := f44ca0cdb8bcdbc98cd10a92caeddd8ac399e6d5 ENV = "./env" ifeq ($(OS),Windows_NT) From c3b8f8341966d4f4e1c2ac24fc810a677a8c539f Mon Sep 17 00:00:00 2001 From: James Douglass Date: Fri, 17 Mar 2023 12:02:46 -0700 Subject: [PATCH 3/3] Updating the python package readme. RE:#1255 --- README_PYTHON.rst | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/README_PYTHON.rst b/README_PYTHON.rst index f817338c55..ee85d195d2 100644 --- a/README_PYTHON.rst +++ b/README_PYTHON.rst @@ -13,9 +13,6 @@ quantify and forecast this return. InVEST enables decision-makers to quantify the importance of natural capital, to assess the tradeoffs associated with alternative choices, and to integrate conservation and human development. -Older versions of InVEST ran as script tools in the ArcGIS ArcToolBox environment, -but have almost all been ported over to a purely open-source python environment. - InVEST is licensed under a permissive, modified BSD license. For more information, see: @@ -33,16 +30,10 @@ Installing InVEST Python Dependencies ------------------- -Dependencies for ``natcap.invest`` are listed in ``requirements.txt``. -Additionally, a python binding for Qt is needed to use the InVEST GUI, but is -not required for development against ``natcap.invest``. InVEST uses the -interface library ``qtpy`` to support ``PyQt5`` and ``PySide2``. In our -experience, ``PyQt5`` and ``PySide2`` have been easiest to work with. One of -these bindings for Qt must be installed in order to use the GUI. - +Runtime dependencies for ``natcap.invest`` are listed in ``requirements.txt``. -Installing from Source ----------------------- +Installing via pip +------------------ If you have a compiler installed and configured for your system, and dependencies installed, the easiest way to install InVEST as a python package @@ -61,14 +52,14 @@ source tree: .. code-block:: console - $ pip install git+https://github.com/natcap/invest@master#egg=natcap.invest + $ pip install "git+https://github.com/natcap/invest@main#egg=natcap.invest" Development =========== -Dependencies for developing InVEST are listed in ``requirements.txt`` and in -``requirements-dev.txt``. If you're running a GUI, you'll need a Qt binding -(see above) and the packages installed in ``requirements-gui.txt``. +Dependencies for InVEST are listed in ``requirements.txt`` (runtime +requirements), ``requirements-dev.txt`` (development requirements), and +``requirements-docs.txt`` (for building documentation). Support =======