Closed rajadain closed 2 months ago
The geoprocessing service should be fixed in 45e4f4d. I haven't seen the other error before, running that command now to see if I encounter it.
Destroy and recreated the app
VM, now seeing that error too. Likely an issue with gwlf-e packaging. Will look into it.
The numpy issues should be fixed in 4c1fe4f and be5b2c0, as already reviewed in https://github.com/WikiWatershed/gwlf-e/pull/101#pullrequestreview-2164557941.
Since you've already provisioned the VM for the review above, try running the failing command above again:
vagrant ssh app -c 'cd /vagrant && ./scripts/aws/setupdb.sh -dmpq'
If it succeeds, then we can probably approve this PR for now, especially because this version is also deployed to staging and is testing well there: https://staging.modelmywatershed.org/.
You'll have to do reinstall the other datasets for the future, but that is a time taking operation and can be deferred till after this review:
vagrant ssh app -c 'cd /vagrant && ./scripts/aws/setupdb.sh -bc' &&
vagrant ssh app -c 'cd /vagrant && ./scripts/aws/setupdb.sh -sS'
Thanks for reviewing! Squashed fixups, will merge once green.
Overview
Upgrades the development and runtime VMs to Ubuntu 22.04, and the environment to Python 3.10. This is done in preparation for #3628 which needs Python 3.10 for
pystac-client
.The big consequences of this change are:
nginx
role is now inlinedmodel-my-watershed.nginx
instead ofazavea.nginx
because with new Ubuntu we don't need the custom PPA that theazavea.nginx
role was installing, and inlining it here was easier than updating it there.Chromium
instead ofFirefox
for JavaScript tests, because installingFirefox
was difficult, and becauseChromium
is a better representative of our userbasedocker
as a system service rather than through the outdateddocker-compose
Python wrapperdocker
to v26 which is not compatible with the old RWD Docker v1 image. This causes RWD to fail. We have https://github.com/WikiWatershed/rapid-watershed-delineation/issues/83 to fix this as a follow up.Closes #3629
Demo
Here's this branch deployed to staging: https://staging.modelmywatershed.org/
Notes
This required the updating of GWLF-E to work with Python 3.10 https://github.com/WikiWatershed/gwlf-e/pull/95 and subsequent release to PyPI https://pypi.org/project/gwlf-e/3.2.0/
This also required significant changes / upgrades to the CivicCI01 Jenkins server. Model My Watershed is the only active project on that server, which made making changes a little safer. All the CI jobs are now passing: http://civicci01.phl.corp.element84.com/view/mmw/
Testing Instructions
develop