Merge branch 'main' of https://github.com/UW-Macrostrat/corelle

* 'main' of https://github.com/UW-Macrostrat/corelle:
  Update README.md
  Update README.md
  Detect whether tests are running in a TTY
  Update changelog
  Get rid of warnings
  All tests pass
  More tests pass
  Updated many tests
  Data importing now works
  Update dependencies and lock packages

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 
-## [Unreleased]
+## [2.2.0] - 2024-01-04
+
+- Update application for Python 3.11
+- Update dependencies including SQLAlchemy 2
+
+## [2.0.0]
+
+- Switch dependency management to Poetry
+- Break into submodules
+
+## [Unknown]
 
 - New [notebooks](notebooks) showing
   [usage in Python](notebooks/Corelle-Basic-Usage.ipynb) and building towards

README.md

@@ -91,9 +91,16 @@ To build (and continuously watch) the frontend, run `make dev`.
 A backend API server will be started and proxied, so you don't have to run
 `corelle serve`.
 
-### Installation with Docker
+### Testing
 
-Simply install Docker and run `docker-compose up --build` in the root directory.
+Corelle contains an extensive set of conformance tests to ensure that it has
+GPlates-compatible rotation handling, and to ensure that rotation APIs perform
+correctly and performantly in both Python and PostGIS. To run the test suite,
+run `make test-docker` in the application directory.
+
+### Running the web app with Docker
+
+Install Docker and run `docker-compose up --build` in the root directory.
 This will build the application, install test data, and spin up the development server.
 
 You can run a development version by creating a `.env` file containing
@@ -104,8 +111,8 @@ for auto-rebuilding.
 ## Todo
 
 - [x] Fix subtle math bugs!
-- [ ] On-database cache of rotations (say, at 1 Ma increments?)
-- [ ] Return pre-rotated feature datasets (rather than just modern versions)
+- [x] On-database cache of rotations (say, at 1 Ma increments?)
+- [x] Return pre-rotated feature datasets (rather than just modern versions)
 - [x] Materialized view for split feature datasets
 - [x] Allow feature datasets to be listed
 - [x] Create a dockerized version

bin/test-docker

@@ -3,6 +3,12 @@
 
 set -e
 
+# Check if we're in a TTY
+TTY_FLAG=""
+if [ -t 1 ]; then
+  TTY_FLAG="-it"
+fi
+
 # Load dotenv if it exists
 if [ -f .env ]; then
   set -o allexport
@@ -44,7 +50,7 @@ docker run --rm \
 EOF
 
 # Run the tests
-docker run -t --rm --link corelle-db:database corelle /code/bin/run-tests $@
+docker run $TTY_FLAG --rm --link corelle-db:database corelle /code/bin/run-tests $@
 
 # Stop the database
 docker stop corelle-db