Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/1368 display changelog in workbench #1681

Merged
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d503097
Get & store invest version to let workbench identify first run of a n…
emilyanndavis Nov 1, 2024
c550879
Add changelog modal with placeholder content
emilyanndavis Nov 2, 2024
4f2149b
Load HTML from external file and render just the relevant section
emilyanndavis Nov 5, 2024
f63d058
Add changelog target to Makefile
emilyanndavis Nov 5, 2024
d5da9d1
Add RST to HTML conversion to release workflow
emilyanndavis Nov 5, 2024
5918705
Add package.json version update steps to release workflow
emilyanndavis Nov 6, 2024
ffb0456
Remove console.log & unneeded comments
emilyanndavis Nov 6, 2024
65f3bb9
Rearrange release workflow steps to consolidate release-related chang…
emilyanndavis Nov 6, 2024
5701a6b
Set up dynamic changelog URL
emilyanndavis Nov 7, 2024
dedd45c
Update version token to support multiple installed versions
emilyanndavis Nov 7, 2024
23b07d3
Delay showing changelog modal until after download modal closes (if f…
emilyanndavis Nov 7, 2024
c66b70c
Fix test failures
emilyanndavis Nov 7, 2024
b6f29c3
Update HISTORY and commit changelog.html
emilyanndavis Nov 7, 2024
c6ba8bb
Add changelog modal tests
emilyanndavis Nov 7, 2024
baf6be2
Reorganize imports in main.js
emilyanndavis Nov 7, 2024
cc8da72
Merge branch 'main' of github.com:natcap/invest into feature/1368-dis…
emilyanndavis Nov 7, 2024
73f00c2
Add changelog modal tests
emilyanndavis Nov 7, 2024
652fdb5
Update puppeteer tests
emilyanndavis Nov 8, 2024
154560e
Revert port number change
emilyanndavis Nov 8, 2024
4f9deff
Fix puppeteer test
emilyanndavis Nov 8, 2024
371fa00
Update App propTypes and defaultProps
emilyanndavis Nov 8, 2024
1d5b05e
Update indentation & update test to use queryBy where appropriate
emilyanndavis Nov 8, 2024
0dbcb0e
Open changelog links in browser instead of in an Electron window
emilyanndavis Nov 11, 2024
56d9c39
Add error handling
emilyanndavis Nov 11, 2024
20c1cca
Update tests
emilyanndavis Nov 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/workflows/release-part-1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,24 @@ jobs:
perl -0777 -i -pe \
"s/Unreleased Changes\n------------------/..\n Unreleased Changes\n ------------------\n\n${HEADER}\n${UNDERLINE}/g" \
HISTORY.rst

- name: Install dependencies
run: pip install rst2html5

- name: Generate changelog.html
run: rst2html5 HISTORY.rst workbench/changelog.html

- name: Update package.json version
uses: BellCubeDev/update-package-version-by-release-tag@v2
with:
version: ${{ inputs.version }}
package-json-path: workbench/package.json

- name: Commit updated HISTORY.rst, changelog.html, and package.json
run: |
git add HISTORY.rst
git add workbench/changelog.html
git add workbench/package.json
git commit -m "Committing the $VERSION release."

- name: Tag and push
Expand Down
28 changes: 15 additions & 13 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,21 @@ Unreleased Changes
reflect changes in how InVEST is installed on modern systems, and also to
include images of the InVEST workbench instead of just broken links.
https://github.com/natcap/invest/issues/1660
* Workbench
* Several small updates to the model input form UI to improve usability
and visual consistency (https://github.com/natcap/invest/issues/912).
* Fixed a bug that caused the application to crash when attempting to
open a workspace without a valid logfile
(https://github.com/natcap/invest/issues/1598).
* Fixed a bug that was allowing readonly workspace directories on Windows
(https://github.com/natcap/invest/issues/1599).
* Fixed a bug that, in certain scenarios, caused a datastack to be saved
with relative paths when the Relative Paths checkbox was left unchecked
(https://github.com/natcap/invest/issues/1609).
* Improved error handling when a datastack cannot be saved with relative
paths across drives (https://github.com/natcap/invest/issues/1608).
* The InVEST changelog now displays in the Workbench the first time a new
version is launched (https://github.com/natcap/invest/issues/1368).
* Coastal Vulnerability
* Fixed a regression where an AOI with multiple features could raise a
TypeError after intersecting with the landmass polygon.
Expand Down Expand Up @@ -75,19 +90,6 @@ Unreleased Changes
* The model now works as expected when the user provides an LULC raster
that does not have a nodata value defined.
https://github.com/natcap/invest/issues/1293
* Workbench
* Several small updates to the model input form UI to improve usability
and visual consistency (https://github.com/natcap/invest/issues/912).
* Fixed a bug that caused the application to crash when attempting to
open a workspace without a valid logfile
(https://github.com/natcap/invest/issues/1598).
* Fixed a bug that was allowing readonly workspace directories on Windows
(https://github.com/natcap/invest/issues/1599).
* Fixed a bug that, in certain scenarios, caused a datastack to be saved
with relative paths when the Relative Paths checkbox was left unchecked
(https://github.com/natcap/invest/issues/1609).
* Improved error handling when a datastack cannot be saved with relative
paths across drives (https://github.com/natcap/invest/issues/1608).

3.14.2 (2024-05-29)
-------------------
Expand Down
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,16 @@ PYTHON_ARCH := $(shell $(PYTHON) -c "import sys; print('x86' if sys.maxsize <= 2

GSUTIL := gsutil
SIGNTOOL := SignTool
RST2HTML5 := rst2html5

# local directory names
DIST_DIR := dist
DIST_DATA_DIR := $(DIST_DIR)/data
BUILD_DIR := build
WORKBENCH := workbench
WORKBENCH_DIST_DIR := $(WORKBENCH)/dist
CHANGELOG_SRC := HISTORY.rst
CHANGELOG_DEST := $(WORKBENCH)/changelog.html

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

changelog:
$(RST2HTML5) $(CHANGELOG_SRC) $(CHANGELOG_DEST)

# Notes on Makefile development
#
# * Use the -drR to show the decision tree (and none of the implicit rules)
Expand Down
1 change: 1 addition & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ requests
coverage
xlwt
build # pip-only
rst2html5
Loading
Loading