Release v3.12

.github/workflows/sphinx_docs.yml

@@ -36,7 +36,7 @@ jobs:
         run: pip install -r dev-requirements.txt
 
       - name: Setup local_settings.py
-        run: python -c "import uuid; print('SECRET_KEY = \'%s\'' % uuid.uuid4())" >> ppa/local_settings.py
+        run: python -c "import uuid; print('SECRET_KEY = \'%s\'' % uuid.uuid4())" >> ppa/settings/local_settings.py
 
       - name: Build Sphinx docs
         run: cd sphinx-docs && make -b coverage html

.github/workflows/unit-tests.yml

@@ -7,9 +7,7 @@ on:
     - cron: "0 16 * * 2"
 
 env:
-  DB_NAME: ppa
-  DB_USER: ppa
-  DB_PASSWORD: ppa
+  DJANGO_ENV: test
 
 jobs:
   js-unit:
@@ -28,7 +26,7 @@ jobs:
             ${{ runner.os }}-node-
       - run: npm ci
       - run: npm run test:unit
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
           flags: javascript
 
@@ -49,13 +47,6 @@ jobs:
         ports:
           - 8983:8983
     steps:
-      # Set the value of DJANGO_DB_BACKEND which is used in ci/testsettings.py to
-      # configure django's ORM based on whether we're testing postgres or mysql
-      - name: Set django database backend adapter
-        env:
-          BACKEND: postgresql
-        run: echo "DJANGO_DB_BACKEND=$(echo "$BACKEND")" >> $GITHUB_ENV
-
       - name: Checkout repository
         uses: actions/checkout@v4
 
@@ -89,12 +80,10 @@ jobs:
           pip install -r dev-requirements.txt
 
       - name: Setup local_settings.py
-        run: |
-          cp ci/testsettings.py ppa/local_settings.py
-          python -c "import uuid; print('SECRET_KEY = \'%s\'' % uuid.uuid4())" >> ppa/local_settings.py
+        run: python -c "import uuid; print('SECRET_KEY = \'%s\'' % uuid.uuid4())" >> ppa/settings/local_settings.py
 
       - name: Run pytest
-        run: py.test --cov=./ --cov-report=xml
+        run: pytest --cov=./ --cov-report=xml
 
       - name: Upload test coverage to Codecov
         uses: codecov/codecov-action@v4

CHANGELOG.rst

@@ -3,6 +3,21 @@
 CHANGELOG
 =========
 
+3.12
+----
+- As an admin, I want the Source ID link in list view to go to the first page of the excerpt for articles and excerpts, so that I can more easily access excerpt content.
+- As a developer, I want a script to do a one-time bulk fix of HathiTrust excerpt page ranges from a spreadsheet so that we can pull the corret content from updated HathiTrust materials.
+- As a developer, I want a script to update all HathiTrust content so that I can refresh locally cached data with OCR improvements and other changes.
+- bugfix: excerpt work ID is now based on sourceID + original page range
+  rather than digital page range
+- bugfix: fix indexing and page count for new excerpts when there are multiple excerpts from a single source
+- bugfix: improved index_pages script error handling for missing page count
+  in database when running in expedited mode
+- new manage command to to report on possible HathiTrust excerpt page range mismatches based on page labels in METS-ALTO
+- utility script to get volume last modification date from public HathiTrust website
+- updated settings to use django-split-settings
+- address deprecation warnings and suppress warnings for dependencies
+
 3.11.4
 ------
 

DEPLOYNOTES.rst

@@ -3,6 +3,32 @@
 Deploy and Upgrade notes
 ========================
 
+3.12
+----
+
+* Settings are now configured with django-split-settings as a module;
+  local_settings.py must be moved to ppa/settings/local_settings.py
+* Index ids for excerpts have changed; this requires reindexing works
+  and pages for excerpts and articles; pages should be indexed
+  after running rsync.  To reindex works::
+
+    python manage.py index -i work
+
+* Local pairtree data should be updated for all HathiTrust works::
+
+    python manage.py hathi_rsync
+
+* After pairtree content has been updated, pages should be updated
+  in Solr::
+
+    python manage.py index_pages
+
+* Digital page ranges for HathiTrust excerpts should be corrected
+  using a CSV file provided by the project team::
+
+    python manage.py adjust_excerpts HT_excerpt_corrections.csv
+
+
 3.11.2
 ------
 

README.rst

@@ -55,7 +55,7 @@ Initial setup and installation:
 
 - Copy sample local settings and configure for your environment::
 
-   cp ppa/local_settings.py.sample ppa/local_settings.py
+   cp ppa/settings/local_settings.py.sample ppa/settings/local_settings.py
 
 - Create a database, configure in local settings in the `DATABASES` dictionary, change `SECRET_KEY`, and run migrations::
 
@@ -109,29 +109,22 @@ either set of assets frequently. These two processes are separate as well::
 Tests
 ~~~~~
 
-Python unit tests are written with `py.test <http://doc.pytest.org/>`_ but use
+Python unit tests are written with `pytest <http://doc.pytest.org/>`_ but use
 Django fixture loading and convenience testing methods when that makes
 things easier. To run them, first install development requirements::
 
     pip install -r dev-requirements.txt
 
-Run tests using py.test.  Note that this currently requires the
-top level project directory be included in your python path.  You can
-accomplish this either by calling pytest via python::
+To run all python unit tests, use:  `pytest`
 
-    python -m pytest
-
-Or, if you wish to use the ``pytest`` command directly, simply add the
-top-level project directory to your python path environment variable::
-
-  setenv PYTHONPATH .  # csh
-  export PYTHONPATH=.  # bash
+Some deprecation warnings for dependencies have been suppressed in
+pytest.ini; to see warnings, run with `pytest -Wd`.
 
 Make sure you configure a test solr connection and set up an empty
 Solr core using the same instructions as for the development core.
 
-Note that python unit tests access a test server over HTTP, and therefore
-expect static files to be compiled – see "Frontend development setup" above
+Some python unit tests access rendered views, and therefore
+expect static files to be compiled; see "Frontend development setup" above
 for how to do this.
 
 In a CI context, we use a fake webpack loader backend that ignores missing assets.

dev-requirements.txt

@@ -1,5 +1,5 @@
 -r requirements.txt
-pytest>=5.0
+pytest>=7.0
 pytest-django>=4.5.2
 pytest-cov
 django-debug-toolbar