Merge branch 'develop'

CHANGES.md

@@ -1,5 +1,9 @@
 #  Change log for DIBS<img width="70em" align="right" src="https://github.com/caltechlibrary/dibs/raw/main/docs/_static/media//dibs-icon.png">
 
+## ★ Version 0.5.2 ★
+
+This version fixes a [bug reported (with a fix) by @dlasusa](https://github.com/caltechlibrary/dibs/issues/93) involving incorrect time zone locale handling in the viewer interface, and also bumps up the required version of [Pillow](https://pypi.org/project/Pillow/) to address [several security vulnerabilities](https://github.com/caltechlibrary/dibs/security/dependabot/3) flagged by Dependabot. It also updates a number of other dependencies in `requirements.txt` to their latest versions.
+
 ## ★ Version 0.5.1 ★
 
 This version fixes an issue wherein trying to add an item that had an incomplete records in the LSP would result in a misleading error about the item being not found at all.

CITATION.cff

@@ -22,12 +22,12 @@ authors:
     given-names: "Thomas E."
     orcid: "https://orcid.org/0000-0001-9266-5146"
 cff-version: "1.1.0"
-date-released: 2021-06-04
+date-released: 2022-02-08
 doi: 10.22002/D1.1988
 keywords: 
   - controlled digital lending
 message: "If you use this software, please cite it using these metadata."
 repository-code: "https://github.com/caltechlibrary/dibs"
 title: "DIBS: An implementation of Controlled Digital Lending"
-version: "0.5.0"
+version: "0.5.2"
 ...

Makefile

@@ -60,7 +60,12 @@ update-init-file:;
 update-codemeta-file:;
 	@sed -i .bak -e "/version/ s/[0-9].[0-9][0-9]*.[0-9][0-9]*/$(version)/" codemeta.json
 
-edited := codemeta.json $(init_file)
+update-citation:;
+	$(eval date  := $(shell date "+%F"))
+	@sed -i .bak -e "/^date-released/ s/[0-9][0-9-]*/$(date)/" CITATION.cff
+	@sed -i .bak -e "/^version/ s/[0-9].[0-9][0-9]*.[0-9][0-9]*/$(version)/" CITATION.cff
+
+edited := codemeta.json $(init_file) CITATION.cff
 
 check-in-updated-files:;
 	git add $(edited)
@@ -90,9 +95,12 @@ print-instructions:;
 update-doi: 
 	sed -i .bak -e 's|/api/record/[0-9]\{1,\}|/api/record/$(doi_tail)|' README.md
 	sed -i .bak -e 's|edu/records/[0-9]\{1,\}|edu/records/$(doi_tail)|' README.md
-	git add README.md
+	sed -i .bak -e '/doi:/ s|10.22002/[0-9]\{1,\}|10.22002/$(doi_tail)|' CITATION.cff
+	git add README.md CITATION.cff
 	git diff-index --quiet HEAD README.md || \
 	    (git commit -m"Update DOI" README.md && git push -v --all)
+	git diff-index --quiet HEAD CITATION.cff || \
+	    (git commit -m"Update DOI" CITATION.cff && git push -v --all)
 
 
 # Cleanup and miscellaneous directives ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

codemeta.json

@@ -6,7 +6,7 @@
     "codeRepository": "https://github.com/caltechlibrary/dibs",
     "issueTracker": "https://github.com/caltechlibrary/dibs/issues",
     "license": "https://github.com/caltechlibrary/dibs/blob/master/LICENSE",
-    "version": "0.5.1",
+    "version": "0.5.2",
     "author": [
         {
             "@type": "Person",

dibs/__init__.py

@@ -22,7 +22,7 @@
 #  |    by the Makefile. Manual changes to these values will be lost.      |
 #  ╰────────────────────── Notice ── Notice ── Notice ─────────────────────╯
 
-__version__     = '0.5.1'
+__version__     = '0.5.2'
 __description__ = 'DIBS (Digital Borrowing System) is an implementation of Controlled Digital Lending'
 __url__         = 'https://github.com/caltechlibrary/dibs'
 __author__      = 'Michael Hucka, Robert S. Doiel, Tommy Keswick, Stephen Davison'

dibs/templates/uv.tpl

@@ -150,7 +150,7 @@
      });
 
      // Calculate the delay to exiration (in msec) and force a reload then.
-     var now = new Date().getTime();
+     var now = new Date().toLocaleString('en-US', {timeZone: 'US/Pacific'}).getTime();
      var end = new Date("{{js_end_time}}").getTime();
      var timeout = (end - now) + 1000;
      setTimeout(() => { window.location.reload(); }, timeout);

requirements.txt

@@ -6,14 +6,14 @@
 # @website https://github.com/caltechlibrary/dibs
 # =============================================================================
 
-arrow           == 1.1.0
+arrow           == 1.2.2
 boltons         == 21.0.0
 bottle          == 0.12.19
 bottle-fdsend   == 0.1.1
 coif            == 0.0.1
-commonpy        == 1.7.1
+commonpy        == 1.8.2
 expiringdict    == 1.2.1
-humanize        == 3.9.0
+humanize        == 3.14.0
 lru-dict        == 1.1.7
 
 # Note: mod_wsgi is only needed by run-server. You can comment it out if you
@@ -25,14 +25,14 @@ mod-wsgi        == 4.7.1
 
 peewee          == 3.14.4
 Pillow          == 9.0.0
-plac            == 1.3.3
+plac            == 1.3.4
 pokapi          == 0.3.1
 python-daemon   == 2.3.0
 python-decouple == 3.4
-rich            == 10.4.0
-sidetrack       == 2.0.0
+rich            == 11.2.0
+sidetrack       == 2.0.1
 str2bool        == 1.1
-trinomial       == 0.0.2
+trinomial       == 0.0.3
 topi            == 1.1.0
 yurl            == 1.0.0
 werkzeug        == 1.0.1

setup.cfg

@@ -8,7 +8,7 @@
 
 [metadata]
 name          = dibs
-version       = 0.5.1
+version       = 0.5.2
 description   = DIBS (Digital Borrowing System) is an implementation of Controlled Digital Lending
 author        = Michael Hucka, Robert S. Doiel, Tommy Keswick, Stephen Davison
 author_email  = [email protected]