Skip to content

Commit ac3e23d

Browse files
xrotwangxrotwang
committed
release 4.2
1 parent e9f2115 commit ac3e23d

6 files changed

Lines changed: 154 additions & 65 deletions

File tree

‎RELEASING.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
# Releasing https://glottolog.org
33

4+
- Remove hacked in editor in glottolog3/templates/dataset/md_txt.mako !
5+
46
- Checkout the corresponding release of glottolog/glottolog.
57
- For major or minor releases: create the static archive including the last release:
68
```shell script

‎glottolog3/commands/cdstar.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def register(parser):
1717
from cdstarcat.catalog import Catalog
1818
except ImportError:
1919
raise ParserError('pip install cdstarcat')
20-
parser.add_argument('version')
20+
parser.add_argument('version', help="version number without 'v' prefix")
2121
parser.add_argument(
2222
'--catalog', type=pathlib.Path, default=pathlib.Path(os.environ['CDSTAR_CATALOG']))
2323
parser.add_argument('--url', default=os.environ['CDSTAR_URL'])

‎glottolog3/releases.ini‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,8 @@ version = 4.1
7676
cdstar_oid = EAEA0-3DAE-E27B-4692-0
7777
sql_dump_md5 = 7fd9e3b9cf245d2b90d2e1ddbec7bfef
7878

79+
[v4.2]
80+
version = 4.2
81+
cdstar_oid = EAEA0-18EC-5079-0173-0
82+
sql_dump_md5 = 0ba3a998e21b233c8456b4f56b1bb378
83+

‎glottolog3/static/downloads.json‎

Lines changed: 144 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,67 +1024,67 @@
10241024
"4.1": {
10251025
"bitstreams": [
10261026
{
1027-
"bitstreamid":"glottolog.sql.gz",
1028-
"checksum":"7fd9e3b9cf245d2b90d2e1ddbec7bfef",
1029-
"created":1574866473234,
1030-
"checksum-algorithm":"MD5",
1031-
"last-modified":1574866480192,
1032-
"filesize":136409095,
1033-
"content-type":"application/x-sql"
1034-
},
1035-
{
1036-
"bitstreamid":"glottolog_language.n3.gz",
1037-
"checksum":"087114894cdf8cccf1deea4d9250f0c8",
1038-
"created":1574866493316,
1039-
"checksum-algorithm":"MD5",
1040-
"last-modified":1574866493359,
1041-
"filesize":3150951,
1042-
"content-type":"application/octet-stream"
1043-
},
1044-
{
1045-
"bitstreamid":"glottolog_languoid.csv.zip",
1046-
"checksum":"e947f5e9cc3fa59f1b78faf305eacd43",
1047-
"created":1574866492794,
1048-
"checksum-algorithm":"MD5",
1049-
"last-modified":1574866492809,
1050-
"filesize":532480,
1051-
"content-type":"application/zip"
1052-
},
1053-
{
1054-
"bitstreamid":"glottolog_source.bib.zip",
1055-
"checksum":"953878bd7c486299e1475bce3f660250",
1056-
"created":1574866489146,
1057-
"checksum-algorithm":"MD5",
1058-
"last-modified":1574866489833,
1059-
"filesize":51887794,
1060-
"content-type":"application/zip"
1061-
},
1062-
{
1063-
"bitstreamid":"glottolog_source.n3.gz",
1064-
"checksum":"b20b92291cf7fea151b5431a5d501811",
1065-
"created":1574866497968,
1066-
"checksum-algorithm":"MD5",
1067-
"last-modified":1574866499133,
1068-
"filesize":49936921,
1069-
"content-type":"application/octet-stream"
1070-
},
1071-
{
1072-
"bitstreamid":"languages_and_dialects_geo.csv",
1073-
"checksum":"54a0f9425c4633574cc8abc9dcb6c405",
1074-
"created":1574866484164,
1075-
"checksum-algorithm":"MD5",
1076-
"last-modified":1574866484205,
1077-
"filesize":960195,
1078-
"content-type":"text/csv"
1079-
},
1080-
{
1081-
"bitstreamid":"tree_glottolog_newick.txt",
1082-
"checksum":"80d0b4e344a0732ecdc356b3c5714ca1",
1083-
"created":1574866502251,
1084-
"checksum-algorithm":"MD5",
1085-
"last-modified":1574866502294,
1086-
"filesize":685916,
1087-
"content-type":"text/plain"
1027+
"bitstreamid": "glottolog.sql.gz",
1028+
"checksum": "7fd9e3b9cf245d2b90d2e1ddbec7bfef",
1029+
"checksum-algorithm": "MD5",
1030+
"content-type": "application/x-sql",
1031+
"created": 1574866473234,
1032+
"filesize": 136409095,
1033+
"last-modified": 1574866480192
1034+
},
1035+
{
1036+
"bitstreamid": "glottolog_language.n3.gz",
1037+
"checksum": "087114894cdf8cccf1deea4d9250f0c8",
1038+
"checksum-algorithm": "MD5",
1039+
"content-type": "application/octet-stream",
1040+
"created": 1574866493316,
1041+
"filesize": 3150951,
1042+
"last-modified": 1574866493359
1043+
},
1044+
{
1045+
"bitstreamid": "glottolog_languoid.csv.zip",
1046+
"checksum": "e947f5e9cc3fa59f1b78faf305eacd43",
1047+
"checksum-algorithm": "MD5",
1048+
"content-type": "application/zip",
1049+
"created": 1574866492794,
1050+
"filesize": 532480,
1051+
"last-modified": 1574866492809
1052+
},
1053+
{
1054+
"bitstreamid": "glottolog_source.bib.zip",
1055+
"checksum": "953878bd7c486299e1475bce3f660250",
1056+
"checksum-algorithm": "MD5",
1057+
"content-type": "application/zip",
1058+
"created": 1574866489146,
1059+
"filesize": 51887794,
1060+
"last-modified": 1574866489833
1061+
},
1062+
{
1063+
"bitstreamid": "glottolog_source.n3.gz",
1064+
"checksum": "b20b92291cf7fea151b5431a5d501811",
1065+
"checksum-algorithm": "MD5",
1066+
"content-type": "application/octet-stream",
1067+
"created": 1574866497968,
1068+
"filesize": 49936921,
1069+
"last-modified": 1574866499133
1070+
},
1071+
{
1072+
"bitstreamid": "languages_and_dialects_geo.csv",
1073+
"checksum": "54a0f9425c4633574cc8abc9dcb6c405",
1074+
"checksum-algorithm": "MD5",
1075+
"content-type": "text/csv",
1076+
"created": 1574866484164,
1077+
"filesize": 960195,
1078+
"last-modified": 1574866484205
1079+
},
1080+
{
1081+
"bitstreamid": "tree_glottolog_newick.txt",
1082+
"checksum": "80d0b4e344a0732ecdc356b3c5714ca1",
1083+
"checksum-algorithm": "MD5",
1084+
"content-type": "text/plain",
1085+
"created": 1574866502251,
1086+
"filesize": 685916,
1087+
"last-modified": 1574866502294
10881088
}
10891089
],
10901090
"metadata": {
@@ -1093,5 +1093,87 @@
10931093
"title": "glottolog 4.1 - downloads"
10941094
},
10951095
"oid": "EAEA0-3DAE-E27B-4692-0"
1096+
},
1097+
"4.2": {
1098+
"bitstreams": [
1099+
{
1100+
"bitstreamid": "glottolog.sql.gz",
1101+
"checksum": "0ba3a998e21b233c8456b4f56b1bb378",
1102+
"checksum-algorithm": "MD5",
1103+
"content-type": "application/x-sql",
1104+
"created": 1587036199092,
1105+
"filesize": 138671732,
1106+
"last-modified": 1587036201750
1107+
},
1108+
{
1109+
"bitstreamid": "glottolog_language.n3.gz",
1110+
"checksum": "3f62166d54bb5c451a9fc21384d51e0a",
1111+
"checksum-algorithm": "MD5",
1112+
"content-type": "application/octet-stream",
1113+
"created": 1587038026335,
1114+
"filesize": 3068304,
1115+
"last-modified": 1587038026399
1116+
},
1117+
{
1118+
"bitstreamid": "glottolog_language.ttl.gz",
1119+
"checksum": "47d9d1dc3a26b1f38625cf6f01bb6493",
1120+
"checksum-algorithm": "MD5",
1121+
"content-type": "text/turtle",
1122+
"created": 1587039023454,
1123+
"filesize": 3069258,
1124+
"last-modified": 1587039023498
1125+
},
1126+
{
1127+
"bitstreamid": "glottolog_languoid.csv.zip",
1128+
"checksum": "42f419d5c1cdc8991765e25d865e51ac",
1129+
"checksum-algorithm": "MD5",
1130+
"content-type": "application/zip",
1131+
"created": 1587037972419,
1132+
"filesize": 543684,
1133+
"last-modified": 1587037972434
1134+
},
1135+
{
1136+
"bitstreamid": "glottolog_source.bib.zip",
1137+
"checksum": "130a4f12a2267cec5b047e9b85cbdc90",
1138+
"checksum-algorithm": "MD5",
1139+
"content-type": "application/zip",
1140+
"created": 1587037958936,
1141+
"filesize": 52897118,
1142+
"last-modified": 1587037959636
1143+
},
1144+
{
1145+
"bitstreamid": "glottolog_source.n3.gz",
1146+
"checksum": "f2bb8f128135b5b24f63fcc602b0e652",
1147+
"checksum-algorithm": "MD5",
1148+
"content-type": "application/octet-stream",
1149+
"created": 1587038951493,
1150+
"filesize": 50862777,
1151+
"last-modified": 1587038952353
1152+
},
1153+
{
1154+
"bitstreamid": "languages_and_dialects_geo.csv",
1155+
"checksum": "beab44b08070bb22236275c34c5ce18d",
1156+
"checksum-algorithm": "MD5",
1157+
"content-type": "text/csv",
1158+
"created": 1587036927835,
1159+
"filesize": 994345,
1160+
"last-modified": 1587036927854
1161+
},
1162+
{
1163+
"bitstreamid": "tree_glottolog_newick.txt",
1164+
"checksum": "52665463217e394d5892890b80403ff3",
1165+
"checksum-algorithm": "MD5",
1166+
"content-type": "text/plain",
1167+
"created": 1587038968381,
1168+
"filesize": 713533,
1169+
"last-modified": 1587038968399
1170+
}
1171+
],
1172+
"metadata": {
1173+
"creator": "pycdstar",
1174+
"description": "Custom downloads for release 4.2 of [Glottolog](http://glottolog.org)",
1175+
"title": "glottolog 4.2 - downloads"
1176+
},
1177+
"oid": "EAEA0-18EC-5079-0173-0"
10961178
}
1097-
}
1179+
}

‎glottolog3/templates/dataset/detail_html.mako‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</p>
8585
<blockquote>
8686
${h.newline2br(TxtCitation.render(ctx, request))|n}<br>
87-
<a href="https://doi.org/10.5281/zenodo.3554959"><img src="https://zenodo.org/badge/DOI/10.5281/zenodo.3554959.svg" alt="DOI"></a>
87+
<a href="https://doi.org/10.5281/zenodo.3753877"><img src="https://zenodo.org/badge/DOI/10.5281/zenodo.3753877.svg" alt="DOI"></a>
8888
</blockquote>
8989
<p>
9090
Particularly important contributors to the Langdoc database are Alain Fabre,

‎glottolog3/templates/dataset/md_txt.mako‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
${request.dataset.formatted_editors()|n}. ${request.dataset.updated.year}.
1+
${request.dataset.formatted_editors()|n} & Bank, Sebastian. ${request.dataset.updated.year}.
22
${request.dataset.name}.
33
${request.dataset.publisher_place}: ${request.dataset.publisher_name}.
44
(Available online at http://${request.dataset.domain}, Accessed on ${h.datetime.date.today()}.)

0 commit comments

Comments
 (0)