release 4.4

Author: xrotwang

RELEASING.md

@@ -3,23 +3,26 @@
 
 - Checkout the corresponding release of glottolog/glottolog.
 - For major or minor releases: create the static archive including the last release:
-  ```shell script
+  ```shell
+  cd ../archive
   glottolog-app create_archive
   tar -czf archive.tgz archive/
   ```
 - initialize the DB running (about 60 mins)
-  ```shell script
+  ```shell
+  cd ../glottolog3
   clld initdb development.ini
   ```
   and check language associations, see e.g. https://github.com/glottolog/glottolog/issues/485
 - mark new languages running
-  ```shell script
+  ```shell
   glottolog-app mark_new_languages
+  pytest
   ```
 - remove old downloads:`rm glottolog3/static/download/glottolog*`
 - run `clld create_downloads development.ini glottolog.org` - about 45 mins
 - run
-  ```shell script
+  ```shell
   glottolog-app newick
   glottolog-app geo development.ini
   glottolog-app sqldump development.ini
@@ -34,25 +37,24 @@
   cdstarcat, and the above command re-run.)
 - 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.
-- `clld-llod` ?
 - update `glottolog3.util.DOI` with the new ZENODO DOI
 
 - draft release of clld/glottolog3
   - commit all changes to glottolog3
   - create release on GitHub
 
 - Now deploy to server:
-```shell script
-workon appconfig
-cd appconfig/apps
-```
-**Note**: For new major or minor releases, we must adapt the `dbdump` option in `apps.ini[glottolog3]` 
-to the new version.
-```shell script
-cd appconfig/apps/glottolog3
-fab copy_archive:../../../../glottolog/glottolog3/archive.tgz
-fab deploy:production
-fab fetch_downloads
-```
+  ```shell
+  workon appconfig
+  cd appconfig/apps
+  ```
+  **Note**: For new major or minor releases, we must adapt the `dbdump` option in `apps.ini[glottolog3]` 
+  to the new version.
+  ```shell
+  cd appconfig/apps/glottolog3
+  fab copy_archive:../../../../glottolog/archive/archive.tgz
+  fab deploy:production
+  fab fetch_downloads
+  ```
 
 - tweet

glottolog3/adapters.py

@@ -107,16 +107,16 @@ def dump_rendered(self, req, fp, item, index, rendered):
 class LanguoidTurtleDump(TurtleDump):
 
     def query(self, req):
-        return req.db.query(Language).options(sa.orm.joinedload_all(
-            Language.languageidentifier, LanguageIdentifier.identifier))\
+        return req.db.query(Language).options(sa.orm.joinedload(
+            Language.languageidentifier).joinedload(LanguageIdentifier.identifier))\
             .order_by(Language.pk)
 
 
 class LanguoidN3Dump(N3Dump):
 
     def query(self, req):
-        return req.db.query(Language).options(sa.orm.joinedload_all(
-            Language.languageidentifier, LanguageIdentifier.identifier))\
+        return req.db.query(Language).options(sa.orm.joinedload(
+            Language.languageidentifier).joinedload(LanguageIdentifier.identifier))\
             .order_by(Language.pk)
 
 

glottolog3/models.py

@@ -400,12 +400,13 @@ class Ref(CustomModelMixin, Source):
 
     providers = relationship(
         Provider,
+        viewonly=True,
         secondary=Refprovider.__table__,
         order_by='Provider.id',
         backref=backref(
             'refs', order_by='Source.author, Source.year, Source.description'))
 
-    bibkeys = relationship(Refprovider, order_by='Refprovider.provider_pk')
+    bibkeys = relationship(Refprovider, order_by='Refprovider.provider_pk', viewonly=True)
 
     def __rdf__(self, request):
         """

glottolog3/releases.ini

@@ -86,3 +86,7 @@ version = 4.3
 cdstar_oid = EAEA0-D501-DBB8-65C4-0
 sql_dump_md5 = d7a2ac9bb53e381719cc138fb948d1c2
 
+[v4.4]
+version = 4.4
+cdstar_oid = EAEA0-E62D-ED67-FD05-0
+sql_dump_md5 = 283fff45a1bf026159495c149d9f2f54

glottolog3/scripts/initializedb.py

@@ -28,7 +28,7 @@
 
 
 def gc2version():
-    return pathlib.Path(glottolog3.__file__).parent.parent / 'archive' / 'glottocode2version.json'
+    return pathlib.Path(glottolog3.__file__).parent.parent / '../archive' / 'archive' / 'glottocode2version.json'
 
 
 def get_glottolog_api(repos):

glottolog3/static/downloads.json

@@ -1257,5 +1257,96 @@
             "title": "glottolog 4.3 - downloads"
         },
         "oid": "EAEA0-D501-DBB8-65C4-0"
+    },
+    "4.4": {
+        "bitstreams": [
+            {
+                "bitstreamid": "glottolog.sql.gz",
+                "checksum": "283fff45a1bf026159495c149d9f2f54",
+                "checksum-algorithm": "MD5",
+                "content-type": "application/x-sql",
+                "created": 1621003923787,
+                "filesize": 141917115,
+                "last-modified": 1621006533686
+            },
+            {
+                "bitstreamid": "glottolog_language.n3.gz",
+                "checksum": "d917964495b1cac09417bbaa361e995f",
+                "checksum-algorithm": "MD5",
+                "content-type": "application/octet-stream",
+                "created": 1621012628774,
+                "filesize": 3149776,
+                "last-modified": 1621012682636
+            },
+            {
+                "bitstreamid": "glottolog_language.ttl.gz",
+                "checksum": "0bf56093bb0ed573c62b2255a711b1e5",
+                "checksum-algorithm": "MD5",
+                "content-type": "text/turtle",
+                "created": 1621012572735,
+                "filesize": 3150707,
+                "last-modified": 1621012628388
+            },
+            {
+                "bitstreamid": "glottolog_language.ttl.gz.jtrohb",
+                "checksum": "a2dcdf7a3f90e820909ac94fd6599b97",
+                "checksum-algorithm": "MD5",
+                "content-type": "application/octet-stream",
+                "created": 1621012700430,
+                "filesize": 43,
+                "last-modified": 1621012700433
+            },
+            {
+                "bitstreamid": "glottolog_languoid.csv.zip",
+                "checksum": "0d896f70136fb47eca57bf8000787ee4",
+                "checksum-algorithm": "MD5",
+                "content-type": "application/zip",
+                "created": 1621012562820,
+                "filesize": 560417,
+                "last-modified": 1621012572306
+            },
+            {
+                "bitstreamid": "glottolog_source.bib.zip",
+                "checksum": "ec83a2e301ab0a89d9480fb48525748a",
+                "checksum-algorithm": "MD5",
+                "content-type": "application/zip",
+                "created": 1621012700660,
+                "filesize": 54598400,
+                "last-modified": 1621013677584
+            },
+            {
+                "bitstreamid": "glottolog_source.n3.gz",
+                "checksum": "4f5564ccff5ea33c9500a2e5648cf6ea",
+                "checksum-algorithm": "MD5",
+                "content-type": "application/octet-stream",
+                "created": 1621010339826,
+                "filesize": 51998772,
+                "last-modified": 1621011229153
+            },
+            {
+                "bitstreamid": "languages_and_dialects_geo.csv",
+                "checksum": "d9c6f8bdcc1f73e445bf353f871f433d",
+                "checksum-algorithm": "MD5",
+                "content-type": "text/csv",
+                "created": 1621012683021,
+                "filesize": 1023941,
+                "last-modified": 1621012700316
+            },
+            {
+                "bitstreamid": "tree_glottolog_newick.txt",
+                "checksum": "13893448554bc73a036b9348123387ca",
+                "checksum-algorithm": "MD5",
+                "content-type": "text/plain",
+                "created": 1621003910955,
+                "filesize": 733349,
+                "last-modified": 1621003923338
+            }
+        ],
+        "metadata": {
+            "creator": "pycdstar",
+            "description": "Custom downloads for release 4.4 of [Glottolog](http://glottolog.org)",
+            "title": "glottolog 4.4 - downloads"
+        },
+        "oid": "EAEA0-E62D-ED67-FD05-0"
     }
 }

glottolog3/util.py

@@ -24,10 +24,10 @@
 from glottolog3.maps import LanguoidMap
 from glottolog3.config import PartnerSite, ISOSite
 
-DOI = "10.5281/zenodo.4061162"
+DOI = "10.5281/zenodo.4761960"
 
-LANG_PATTERN = re.compile('\[(?P<id>[^\]]+)\]')
-ISO_PATTERN = re.compile(r'\[(?P<iso>[a-z]{3})\]')
+LANG_PATTERN = re.compile(r'\[(?P<id>[^]]+)]')
+ISO_PATTERN = re.compile(r'\[(?P<iso>[a-z]{3})]')
 
 
 def set_focus(url, focus):