Skip to content

Commit 3fc95d2

Browse files
authored
Merge pull request natcap#1681 from emilyanndavis/feature/1368-display-changelog-in-workbench
Feature/1368 display changelog in workbench
2 parents b304916 + 20c1cca commit 3fc95d2

19 files changed

+3630
-35
lines changed

.github/workflows/release-part-1.yml

+17
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,24 @@ jobs:
5353
perl -0777 -i -pe \
5454
"s/Unreleased Changes\n------------------/..\n Unreleased Changes\n ------------------\n\n${HEADER}\n${UNDERLINE}/g" \
5555
HISTORY.rst
56+
57+
- name: Install dependencies
58+
run: pip install rst2html5
59+
60+
- name: Generate changelog.html
61+
run: rst2html5 HISTORY.rst workbench/changelog.html
62+
63+
- name: Update package.json version
64+
uses: BellCubeDev/update-package-version-by-release-tag@v2
65+
with:
66+
version: ${{ inputs.version }}
67+
package-json-path: workbench/package.json
68+
69+
- name: Commit updated HISTORY.rst, changelog.html, and package.json
70+
run: |
5671
git add HISTORY.rst
72+
git add workbench/changelog.html
73+
git add workbench/package.json
5774
git commit -m "Committing the $VERSION release."
5875
5976
- name: Tag and push

HISTORY.rst

+15-13
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,21 @@ Unreleased Changes
4848
reflect changes in how InVEST is installed on modern systems, and also to
4949
include images of the InVEST workbench instead of just broken links.
5050
https://github.com/natcap/invest/issues/1660
51+
* Workbench
52+
* Several small updates to the model input form UI to improve usability
53+
and visual consistency (https://github.com/natcap/invest/issues/912).
54+
* Fixed a bug that caused the application to crash when attempting to
55+
open a workspace without a valid logfile
56+
(https://github.com/natcap/invest/issues/1598).
57+
* Fixed a bug that was allowing readonly workspace directories on Windows
58+
(https://github.com/natcap/invest/issues/1599).
59+
* Fixed a bug that, in certain scenarios, caused a datastack to be saved
60+
with relative paths when the Relative Paths checkbox was left unchecked
61+
(https://github.com/natcap/invest/issues/1609).
62+
* Improved error handling when a datastack cannot be saved with relative
63+
paths across drives (https://github.com/natcap/invest/issues/1608).
64+
* The InVEST changelog now displays in the Workbench the first time a new
65+
version is launched (https://github.com/natcap/invest/issues/1368).
5166
* Coastal Vulnerability
5267
* Fixed a regression where an AOI with multiple features could raise a
5368
TypeError after intersecting with the landmass polygon.
@@ -75,19 +90,6 @@ Unreleased Changes
7590
* The model now works as expected when the user provides an LULC raster
7691
that does not have a nodata value defined.
7792
https://github.com/natcap/invest/issues/1293
78-
* Workbench
79-
* Several small updates to the model input form UI to improve usability
80-
and visual consistency (https://github.com/natcap/invest/issues/912).
81-
* Fixed a bug that caused the application to crash when attempting to
82-
open a workspace without a valid logfile
83-
(https://github.com/natcap/invest/issues/1598).
84-
* Fixed a bug that was allowing readonly workspace directories on Windows
85-
(https://github.com/natcap/invest/issues/1599).
86-
* Fixed a bug that, in certain scenarios, caused a datastack to be saved
87-
with relative paths when the Relative Paths checkbox was left unchecked
88-
(https://github.com/natcap/invest/issues/1609).
89-
* Improved error handling when a datastack cannot be saved with relative
90-
paths across drives (https://github.com/natcap/invest/issues/1608).
9193

9294
3.14.2 (2024-05-29)
9395
-------------------

Makefile

+7
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,16 @@ PYTHON_ARCH := $(shell $(PYTHON) -c "import sys; print('x86' if sys.maxsize <= 2
6666

6767
GSUTIL := gsutil
6868
SIGNTOOL := SignTool
69+
RST2HTML5 := rst2html5
6970

7071
# local directory names
7172
DIST_DIR := dist
7273
DIST_DATA_DIR := $(DIST_DIR)/data
7374
BUILD_DIR := build
7475
WORKBENCH := workbench
7576
WORKBENCH_DIST_DIR := $(WORKBENCH)/dist
77+
CHANGELOG_SRC := HISTORY.rst
78+
CHANGELOG_DEST := $(WORKBENCH)/changelog.html
7679

7780
# The fork name and user here are derived from the git path on github.
7881
# The fork name will need to be set manually (e.g. make FORKNAME=natcap/invest)
@@ -141,6 +144,7 @@ help:
141144
@echo " binaries to build pyinstaller binaries"
142145
@echo " apidocs to build HTML API documentation"
143146
@echo " userguide to build HTML version of the users guide"
147+
@echo " changelog to build HTML version of the changelog"
144148
@echo " python_packages to build natcap.invest wheel and source distributions"
145149
@echo " codesign_mac to sign the mac disk image using the codesign utility"
146150
@echo " codesign_windows to sign the windows installer using the SignTool utility"
@@ -366,6 +370,9 @@ deploy:
366370
@echo "Application binaries (if they were created) can be downloaded from:"
367371
@echo " * $(DOWNLOAD_DIR_URL)"
368372

373+
changelog:
374+
$(RST2HTML5) $(CHANGELOG_SRC) $(CHANGELOG_DEST)
375+
369376
# Notes on Makefile development
370377
#
371378
# * Use the -drR to show the decision tree (and none of the implicit rules)

requirements-dev.txt

+1
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ requests
2626
coverage
2727
xlwt
2828
build # pip-only
29+
rst2html5

0 commit comments

Comments
 (0)