Skip to content

Commit

Permalink
Merge pull request #1257 from phargogh/task/1255-3.13.0-release
Browse files Browse the repository at this point in the history
3.13.0 Release
  • Loading branch information
emlys authored Mar 17, 2023
2 parents 5224657 + c3b8f83 commit ca3051d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 20 deletions.
4 changes: 2 additions & 2 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
23 changes: 7 additions & 16 deletions README_PYTHON.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
=======
Expand Down

0 comments on commit ca3051d

Please sign in to comment.