From a196435a0e88f85785742cdd089344f97401b43a Mon Sep 17 00:00:00 2001 From: Martin Czygan Date: Sat, 21 Dec 2019 23:30:56 +0100 Subject: address first round of MR14 comments * add missing langdetect * use entity_to_dict for json debug output * factor out code for fields in function and add table driven tests * update citeproc types * add author as default role * add raw_affiliation * include relations from datacite * remove url (covered by doi already) Using yapf for python formatting. --- python/Pipfile | 1 + 1 file changed, 1 insertion(+) (limited to 'python/Pipfile') diff --git a/python/Pipfile b/python/Pipfile index dfb87514..6325c180 100644 --- a/python/Pipfile +++ b/python/Pipfile @@ -49,6 +49,7 @@ elasticsearch-dsl = ">=6.0.0,<7.0.0" elasticsearch = ">=6.0.0,<7.0.0" langcodes = ">=1.4" dateparser = ">=0.7" +langdetect = "*" [requires] # Python 3.5 is the bundled (system) version of python for Ubuntu 16.04 -- cgit v1.2.3 From a4cd65ed4897987e70520d81c7caa27cd28ed5a3 Mon Sep 17 00:00:00 2001 From: Martin Czygan Date: Thu, 26 Dec 2019 17:30:54 +0100 Subject: remove langcodes dependency --- python/Pipfile | 1 - python/Pipfile.lock | 14 -------------- 2 files changed, 15 deletions(-) (limited to 'python/Pipfile') diff --git a/python/Pipfile b/python/Pipfile index 6325c180..5d50b37c 100644 --- a/python/Pipfile +++ b/python/Pipfile @@ -47,7 +47,6 @@ pylatexenc = "*" pygal = "*" elasticsearch-dsl = ">=6.0.0,<7.0.0" elasticsearch = ">=6.0.0,<7.0.0" -langcodes = ">=1.4" dateparser = ">=0.7" langdetect = "*" diff --git a/python/Pipfile.lock b/python/Pipfile.lock index f0f60aa8..25606b3c 100644 --- a/python/Pipfile.lock +++ b/python/Pipfile.lock @@ -299,13 +299,6 @@ ], "version": "==2.5.0" }, - "langcodes": { - "hashes": [ - "sha256:22cff103b6c0f3c9907d9a51c2d634177a50a189672ad16d959a3e2cd48eadab" - ], - "index": "pypi", - "version": "==1.4.1" - }, "langdetect": { "hashes": [ "sha256:91a170d5f0ade380db809b3ba67f08e95fe6c6c8641f96d67a51ff7e98a9bf30" @@ -352,13 +345,6 @@ ], "version": "==4.4.2" }, - "marisa-trie": { - "hashes": [ - "sha256:4419abb6b603c97e863fad994abe57ed247fb12491f4bbacb2d762bd2e8958b6", - "sha256:c73bc25d868e8c4ea7aa7f1e19892db07bba2463351269b05340ccfa06eb2baf" - ], - "version": "==0.7.5" - }, "markupsafe": { "hashes": [ "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", -- cgit v1.2.3 From 7091fdd4a1eb4aad03776a07392ea752c1cc3c27 Mon Sep 17 00:00:00 2001 From: Martin Czygan Date: Fri, 3 Jan 2020 15:00:27 +0100 Subject: add missing pathlib2 dependency first seen in CI (jobs/230137), slightly related: https://github.com/pytest-dev/pytest/issues/3953 --- python/Pipfile | 1 + python/Pipfile.lock | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'python/Pipfile') diff --git a/python/Pipfile b/python/Pipfile index 5d50b37c..3d546a84 100644 --- a/python/Pipfile +++ b/python/Pipfile @@ -49,6 +49,7 @@ elasticsearch-dsl = ">=6.0.0,<7.0.0" elasticsearch = ">=6.0.0,<7.0.0" dateparser = ">=0.7" langdetect = "*" +pathlib2 = "*" [requires] # Python 3.5 is the bundled (system) version of python for Ubuntu 16.04 diff --git a/python/Pipfile.lock b/python/Pipfile.lock index 05bbd488..73dc20f0 100644 --- a/python/Pipfile.lock +++ b/python/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "f6e7c193796101c8592827483aaed50efec5e8c261c5a179aea494f8a24cb4dc" + "sha256": "0ac9595590f2f5e28ac95eddbb7d16de69733a5e642663cb00136a4227b53e78" }, "pipfile-spec": 6, "requires": { @@ -398,6 +398,14 @@ ], "version": "==3.1.0" }, + "pathlib2": { + "hashes": [ + "sha256:0ec8205a157c80d7acc301c0b18fbd5d44fe655968f5d947b6ecef5290fc35db", + "sha256:6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868" + ], + "index": "pypi", + "version": "==2.3.5" + }, "pycparser": { "hashes": [ "sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3" @@ -807,6 +815,14 @@ ], "version": "==0.5.2" }, + "pathlib2": { + "hashes": [ + "sha256:0ec8205a157c80d7acc301c0b18fbd5d44fe655968f5d947b6ecef5290fc35db", + "sha256:6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868" + ], + "index": "pypi", + "version": "==2.3.5" + }, "pexpect": { "hashes": [ "sha256:2094eefdfcf37a1fdbfb9aa090862c1a4878e5c7e0e7e7088bdb511c558e5cd1", -- cgit v1.2.3 From b31955dbae89494735b230a25baa17797874e47e Mon Sep 17 00:00:00 2001 From: Martin Czygan Date: Fri, 3 Jan 2020 16:12:38 +0100 Subject: add pycountry dependency --- python/Pipfile | 1 + python/Pipfile.lock | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'python/Pipfile') diff --git a/python/Pipfile b/python/Pipfile index 3d546a84..01c1eb3d 100644 --- a/python/Pipfile +++ b/python/Pipfile @@ -50,6 +50,7 @@ elasticsearch = ">=6.0.0,<7.0.0" dateparser = ">=0.7" langdetect = "*" pathlib2 = "*" +pycountry = "*" [requires] # Python 3.5 is the bundled (system) version of python for Ubuntu 16.04 diff --git a/python/Pipfile.lock b/python/Pipfile.lock index 73dc20f0..35125b67 100644 --- a/python/Pipfile.lock +++ b/python/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "0ac9595590f2f5e28ac95eddbb7d16de69733a5e642663cb00136a4227b53e78" + "sha256": "fb9c3d2307483efe01d9c28a306bad319c84a94a4253d5c7c25bcfe2dad20c5d" }, "pipfile-spec": 6, "requires": { @@ -406,6 +406,13 @@ "index": "pypi", "version": "==2.3.5" }, + "pycountry": { + "hashes": [ + "sha256:3c57aa40adcf293d59bebaffbe60d8c39976fba78d846a018dc0c2ec9c6cb3cb" + ], + "index": "pypi", + "version": "==19.8.18" + }, "pycparser": { "hashes": [ "sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3" -- cgit v1.2.3