Skip to content

Commit 207b29c

Browse files
committed
prep for release 4.5
1 parent 9b5b3c0 commit 207b29c

File tree

6 files changed

+97
-5
lines changed

6 files changed

+97
-5
lines changed

RELEASING.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@
3333
- gzipped db dump
3434

3535
- upload downloads to cdstar running `glottolog-app cdstar <release>`
36-
(if no bitstreams are added to the catalog, the object may need to be re-added via
37-
cdstarcat, and the above command re-run.)
36+
if no bitstreams are added to the catalog, the object may need to be re-added via
37+
cdstarcat, and the above command re-run. To do so,
38+
- look for "glottolog <release>" in https://cdstar.eva.mpg.de and note the OID
39+
- run `cdstarcat add EAEA0-...`
40+
- run `glottolog-app cdstar <release> --oid <OID>`
3841
- register sql dump download in `glottolog3/releases.ini` by adding a new section for the release or
3942
updating the md5 hash of the sql dump for a bugfix release with the data from downloads.json.
4043
- update `glottolog3.util.DOI` with the new ZENODO DOI

glottolog3/commands/cdstar.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ def register(parser): # pragma: no cover
2424
parser.add_argument('--user', default=os.environ.get('CDSTAR_USER'))
2525
parser.add_argument('--pwd', default=os.environ.get('CDSTAR_PWD'))
2626
parser.add_argument('--catalog_class', help=argparse.SUPPRESS, default=Catalog)
27+
parser.add_argument('--oid', default=None)
2728

2829

2930
def run(args): # pragma: no cover
@@ -44,7 +45,7 @@ def run(args): # pragma: no cover
4445
# This is a bugfix release, we don't have to create a new object on CDSTAR!
4546
obj = cat.api.get_object(uid=downloads[release]['oid'])
4647
else:
47-
obj = cat.api.get_object()
48+
obj = cat.api.get_object(uid=args.oid)
4849
obj.metadata = {
4950
"creator": "pycdstar",
5051
"title": "glottolog %s - downloads" % release,

glottolog3/releases.ini

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,9 @@ sql_dump_md5 = d7a2ac9bb53e381719cc138fb948d1c2
9090
version = 4.4
9191
cdstar_oid = EAEA0-E62D-ED67-FD05-0
9292
sql_dump_md5 = 283fff45a1bf026159495c149d9f2f54
93+
94+
[v4.5]
95+
version = 4.5
96+
cdstar_oid = EAEA0-F8BB-0AB6-96FA-0
97+
sql_dump_md5 = 39efdf7654c4958ae21fb442f883bb66
98+

glottolog3/static/downloads.json

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,5 +1348,87 @@
13481348
"title": "glottolog 4.4 - downloads"
13491349
},
13501350
"oid": "EAEA0-E62D-ED67-FD05-0"
1351+
},
1352+
"4.5": {
1353+
"bitstreams": [
1354+
{
1355+
"bitstreamid": "glottolog.sql.gz",
1356+
"checksum": "39efdf7654c4958ae21fb442f883bb66",
1357+
"checksum-algorithm": "MD5",
1358+
"content-type": "application/x-sql",
1359+
"created": 1639146443500,
1360+
"filesize": 143215390,
1361+
"last-modified": 1639147183418
1362+
},
1363+
{
1364+
"bitstreamid": "glottolog_language.n3.gz",
1365+
"checksum": "7e04653f7aeeb147fb4a757bc427a4cb",
1366+
"checksum-algorithm": "MD5",
1367+
"content-type": "application/octet-stream",
1368+
"created": 1639148718874,
1369+
"filesize": 3189512,
1370+
"last-modified": 1639148734511
1371+
},
1372+
{
1373+
"bitstreamid": "glottolog_language.ttl.gz",
1374+
"checksum": "45fb3077cc15d7ce646fffbe29edf257",
1375+
"checksum-algorithm": "MD5",
1376+
"content-type": "text/turtle",
1377+
"created": 1639148702790,
1378+
"filesize": 3190325,
1379+
"last-modified": 1639148718586
1380+
},
1381+
{
1382+
"bitstreamid": "glottolog_languoid.csv.zip",
1383+
"checksum": "af4db0d996bd46f7e1035da63e34f477",
1384+
"checksum-algorithm": "MD5",
1385+
"content-type": "application/zip",
1386+
"created": 1639148699760,
1387+
"filesize": 564997,
1388+
"last-modified": 1639148702544
1389+
},
1390+
{
1391+
"bitstreamid": "glottolog_source.bib.zip",
1392+
"checksum": "3078acc1f1aca22d2d5798c269cbb413",
1393+
"checksum-algorithm": "MD5",
1394+
"content-type": "application/zip",
1395+
"created": 1639148739982,
1396+
"filesize": 55052883,
1397+
"last-modified": 1639149012325
1398+
},
1399+
{
1400+
"bitstreamid": "glottolog_source.n3.gz",
1401+
"checksum": "5c52076e795fef1e4dc5845aecaa504d",
1402+
"checksum-algorithm": "MD5",
1403+
"content-type": "application/octet-stream",
1404+
"created": 1639148026994,
1405+
"filesize": 52509031,
1406+
"last-modified": 1639148291106
1407+
},
1408+
{
1409+
"bitstreamid": "languages_and_dialects_geo.csv",
1410+
"checksum": "e2c592e65e965217fd04aef0470d6e54",
1411+
"checksum-algorithm": "MD5",
1412+
"content-type": "text/csv",
1413+
"created": 1639148734739,
1414+
"filesize": 1032993,
1415+
"last-modified": 1639148739836
1416+
},
1417+
{
1418+
"bitstreamid": "tree_glottolog_newick.txt",
1419+
"checksum": "45ca74125095806cf8c7908bb26aaf0b",
1420+
"checksum-algorithm": "MD5",
1421+
"content-type": "text/plain",
1422+
"created": 1639146439005,
1423+
"filesize": 739438,
1424+
"last-modified": 1639146442472
1425+
}
1426+
],
1427+
"metadata": {
1428+
"creator": "pycdstar",
1429+
"description": "Custom downloads for release 4.5 of [Glottolog](http://glottolog.org)",
1430+
"title": "glottolog 4.5 - downloads"
1431+
},
1432+
"oid": "EAEA0-F8BB-0AB6-96FA-0"
13511433
}
13521434
}

glottolog3/templates/langdocstatus/intro.mako

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
and
8989
${h.external_link("http://www.ethnologue.com", label="Ethnologue")}.
9090
Over time, assessments from other sources were included as well. For a full list of sources, see
91-
${h.external_link("https://github.com/glottolog/glottolog/blob/master/config/aes_sources.ini", label="AES sources in the Glottolog repository")].
91+
${h.external_link("https://github.com/glottolog/glottolog/blob/master/config/aes_sources.ini", label="AES sources in the Glottolog repository")}.
9292
</p>
9393
<table class="table table-nonfluid">
9494
<thead>

glottolog3/util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from glottolog3.maps import LanguoidMap
2525
from glottolog3.config import PartnerSite, ISOSite
2626

27-
DOI = "10.5281/zenodo.4761960"
27+
DOI = "10.5281/zenodo.5772642"
2828

2929
LANG_PATTERN = re.compile(r'\[(?P<id>[^]]+)]')
3030
ISO_PATTERN = re.compile(r'\[(?P<iso>[a-z]{3})]')

0 commit comments

Comments
 (0)