prep for release 4.5

clld · Dec 10, 2021 · 207b29c · 207b29c
1 parent 9b5b3c0
commit 207b29c
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 5 deletions.
diff --git a/RELEASING.md b/RELEASING.md
@@ -33,8 +33,11 @@
   - gzipped db dump
 
 - upload downloads to cdstar running `glottolog-app cdstar <release>`
-  (if no bitstreams are added to the catalog, the object may need to be re-added via
-  cdstarcat, and the above command re-run.)
+  if no bitstreams are added to the catalog, the object may need to be re-added via
+  cdstarcat, and the above command re-run. To do so,
+  - look for "glottolog <release>" in https://cdstar.eva.mpg.de and note the OID
+  - run `cdstarcat add EAEA0-...`
+  - run `glottolog-app cdstar <release> --oid <OID>`
 - register sql dump download in `glottolog3/releases.ini` by adding a new section for the release or
   updating the md5 hash of the sql dump for a bugfix release with the data from downloads.json.
 - update `glottolog3.util.DOI` with the new ZENODO DOI

diff --git a/glottolog3/commands/cdstar.py b/glottolog3/commands/cdstar.py
@@ -24,6 +24,7 @@ def register(parser):  # pragma: no cover
     parser.add_argument('--user', default=os.environ.get('CDSTAR_USER'))
     parser.add_argument('--pwd', default=os.environ.get('CDSTAR_PWD'))
     parser.add_argument('--catalog_class', help=argparse.SUPPRESS, default=Catalog)
+    parser.add_argument('--oid', default=None)
 
 
 def run(args):  # pragma: no cover
@@ -44,7 +45,7 @@ def run(args):  # pragma: no cover
             # This is a bugfix release, we don't have to create a new object on CDSTAR!
             obj = cat.api.get_object(uid=downloads[release]['oid'])
         else:
-            obj = cat.api.get_object()
+            obj = cat.api.get_object(uid=args.oid)
             obj.metadata = {
                 "creator": "pycdstar",
                 "title": "glottolog %s - downloads" % release,

diff --git a/glottolog3/releases.ini b/glottolog3/releases.ini
@@ -90,3 +90,9 @@ sql_dump_md5 = d7a2ac9bb53e381719cc138fb948d1c2
 version = 4.4
 cdstar_oid = EAEA0-E62D-ED67-FD05-0
 sql_dump_md5 = 283fff45a1bf026159495c149d9f2f54
+
+[v4.5]
+version = 4.5
+cdstar_oid = EAEA0-F8BB-0AB6-96FA-0
+sql_dump_md5 = 39efdf7654c4958ae21fb442f883bb66
+
diff --git a/glottolog3/static/downloads.json b/glottolog3/static/downloads.json
@@ -1348,5 +1348,87 @@
             "title": "glottolog 4.4 - downloads"
         },
         "oid": "EAEA0-E62D-ED67-FD05-0"
+    },
+    "4.5": {
+        "bitstreams": [
+            {
+                "bitstreamid": "glottolog.sql.gz",
+                "checksum": "39efdf7654c4958ae21fb442f883bb66",
+                "checksum-algorithm": "MD5",
+                "content-type": "application/x-sql",
+                "created": 1639146443500,
+                "filesize": 143215390,
+                "last-modified": 1639147183418
+            },
+            {
+                "bitstreamid": "glottolog_language.n3.gz",
+                "checksum": "7e04653f7aeeb147fb4a757bc427a4cb",
+                "checksum-algorithm": "MD5",
+                "content-type": "application/octet-stream",
+                "created": 1639148718874,
+                "filesize": 3189512,
+                "last-modified": 1639148734511
+            },
+            {
+                "bitstreamid": "glottolog_language.ttl.gz",
+                "checksum": "45fb3077cc15d7ce646fffbe29edf257",
+                "checksum-algorithm": "MD5",
+                "content-type": "text/turtle",
+                "created": 1639148702790,
+                "filesize": 3190325,
+                "last-modified": 1639148718586
+            },
+            {
+                "bitstreamid": "glottolog_languoid.csv.zip",
+                "checksum": "af4db0d996bd46f7e1035da63e34f477",
+                "checksum-algorithm": "MD5",
+                "content-type": "application/zip",
+                "created": 1639148699760,
+                "filesize": 564997,
+                "last-modified": 1639148702544
+            },
+            {
+                "bitstreamid": "glottolog_source.bib.zip",
+                "checksum": "3078acc1f1aca22d2d5798c269cbb413",
+                "checksum-algorithm": "MD5",
+                "content-type": "application/zip",
+                "created": 1639148739982,
+                "filesize": 55052883,
+                "last-modified": 1639149012325
+            },
+            {
+                "bitstreamid": "glottolog_source.n3.gz",
+                "checksum": "5c52076e795fef1e4dc5845aecaa504d",
+                "checksum-algorithm": "MD5",
+                "content-type": "application/octet-stream",
+                "created": 1639148026994,
+                "filesize": 52509031,
+                "last-modified": 1639148291106
+            },
+            {
+                "bitstreamid": "languages_and_dialects_geo.csv",
+                "checksum": "e2c592e65e965217fd04aef0470d6e54",
+                "checksum-algorithm": "MD5",
+                "content-type": "text/csv",
+                "created": 1639148734739,
+                "filesize": 1032993,
+                "last-modified": 1639148739836
+            },
+            {
+                "bitstreamid": "tree_glottolog_newick.txt",
+                "checksum": "45ca74125095806cf8c7908bb26aaf0b",
+                "checksum-algorithm": "MD5",
+                "content-type": "text/plain",
+                "created": 1639146439005,
+                "filesize": 739438,
+                "last-modified": 1639146442472
+            }
+        ],
+        "metadata": {
+            "creator": "pycdstar",
+            "description": "Custom downloads for release 4.5 of [Glottolog](http://glottolog.org)",
+            "title": "glottolog 4.5 - downloads"
+        },
+        "oid": "EAEA0-F8BB-0AB6-96FA-0"
     }
 }
diff --git a/glottolog3/templates/langdocstatus/intro.mako b/glottolog3/templates/langdocstatus/intro.mako
@@ -88,7 +88,7 @@
     and
     ${h.external_link("http://www.ethnologue.com", label="Ethnologue")}.
     Over time, assessments from other sources were included as well. For a full list of sources, see
-    ${h.external_link("https://github.com/glottolog/glottolog/blob/master/config/aes_sources.ini", label="AES sources in the Glottolog repository")].
+    ${h.external_link("https://github.com/glottolog/glottolog/blob/master/config/aes_sources.ini", label="AES sources in the Glottolog repository")}.
 </p>
 <table class="table table-nonfluid">
     <thead>

diff --git a/glottolog3/util.py b/glottolog3/util.py
@@ -24,7 +24,7 @@
 from glottolog3.maps import LanguoidMap
 from glottolog3.config import PartnerSite, ISOSite
 
-DOI = "10.5281/zenodo.4761960"
+DOI = "10.5281/zenodo.5772642"
 
 LANG_PATTERN = re.compile(r'\[(?P<id>[^]]+)]')
 ISO_PATTERN = re.compile(r'\[(?P<iso>[a-z]{3})]')