Commit f6331495 authored by Markus Shepherd's avatar Markus Shepherd

Merge branch 'linking' into 'master'

Resolve "make linking work in build workflow"

Closes #205

See merge request !73
parents e1b2ed72 4738351d
......@@ -89,10 +89,10 @@
},
"decorator": {
"hashes": [
"sha256:33cd704aea07b4c28b3eb2c97d288a06918275dac0ecebdaf1bc8a48d98adb9e",
"sha256:cabb249f4710888a2fc0e13e9a16c343d932033718ff62e1e9bc93a9d3a9122b"
"sha256:86156361c50488b84a3f148056ea716ca587df2f0de1d34750d35c21312725de",
"sha256:f069f3a01830ca754ba5258fde2278454a0b5b79e0d7f5c13b3b97e57d4acff6"
],
"version": "==4.3.2"
"version": "==4.4.0"
},
"django": {
"hashes": [
......@@ -138,10 +138,10 @@
"grpc"
],
"hashes": [
"sha256:3157625b4f4f033650c6e674d52fd8a3a8c116b26b39705cddf4ed61621c09ff",
"sha256:c6d834143a2bea4de8d1161b5460fd362457db40c55ea9ccbe672e5602e330af"
"sha256:25e20c24395439dffcdb6e364cc6adb9b28a9e28d516ef5a51b9266ae0894a44",
"sha256:b1fce5000657dfa4d2ed3a7c94addf9c74fc3e632c7b0e8611b0e8519d1e610a"
],
"version": "==1.8.0"
"version": "==1.8.1"
},
"google-auth": {
"hashes": [
......@@ -152,11 +152,11 @@
},
"google-cloud-pubsub": {
"hashes": [
"sha256:32dbaf9b8c16d4a14b7e1eca2805689f82f69f542a68bf1516b9c77a3ef54b73",
"sha256:4186386aec02752e982eeb1e399d76f1cf70eed56312934df04bfa68d8cfabf0"
"sha256:0df0fecb21ae05d313c0c3ff9923bef8f863b1d62455f9254c8c74915f585042",
"sha256:1e89df2a19c52d9ea7c7cc84e5c51518cabd41a2b74de6fcd55c90ea9a3c4479"
],
"index": "pypi",
"version": "==0.39.1"
"version": "==0.40.0"
},
"googleapis-common-protos": {
"extras": [
......@@ -300,28 +300,28 @@
},
"pandas": {
"hashes": [
"sha256:02c830f951f3dc8c3164e2639a8961881390f7492f71a7835c2330f54539ad57",
"sha256:179015834c72a577486337394493cc2969feee9a04a2ea09f50c724e4b52ab42",
"sha256:3894960d43c64cfea5142ac783b101362f5008ee92e962392156a3f8d1558995",
"sha256:435821cb2501eabbcee7e83614bd710940dc0cf28b5afbc4bdb816c31cec71af",
"sha256:8294dea9aa1811f93558702856e3b68dd1dfd7e9dbc8e0865918a07ee0f21c2c",
"sha256:844e745ab27a9a01c86925fe776f9d2e09575e65f0bf8eba5090edddd655dffc",
"sha256:a08d49f5fa2a2243262fe5581cb89f6c0c7cc525b8d6411719ab9400a9dc4a82",
"sha256:a435c251246075337eb9fdc4160fd15c8a87cc0679d8d61fb5255d8d5a12f044",
"sha256:a799f03c0ec6d8687f425d7d6c075e8055a9a808f1ba87604d91f20507631d8d",
"sha256:aea72ce5b3a016b578cc05c04a2f68d9cafacf5d784b6fe832e66381cb62c719",
"sha256:c145e94c6da2af7eaf1fd827293ac1090a61a9b80150bebe99f8966a02378db9",
"sha256:c8a7b470c88c779301b73b23cabdbbd94b83b93040b2ccffa409e06df23831c0",
"sha256:c9e31b36abbd7b94c547d9047f13e1546e3ba967044cf4f9718575fcb7b81bb6",
"sha256:d960b7a03c33c328c723cfc2f8902a6291645f4efa0a5c1d4c5fa008cdc1ea77",
"sha256:da21fae4c173781b012217c9444f13c67449957a4d45184a9718268732c09564",
"sha256:db26c0fea0bd7d33c356da98bafd2c0dfb8f338e45e2824ff8f4f3e61b5c5f25",
"sha256:dc296c3f16ec620cfb4daf0f672e3c90f3920ece8261b2760cd0ebd9cd4daa55",
"sha256:e8da67cb2e9333ec30d53cfb96e27a4865d1648688e5471699070d35d8ab38cf",
"sha256:fb4f047a63f91f22aade4438aaf790400b96644e802daab4293e9b799802f93f",
"sha256:fef9939176cba0c2526ebeefffb8b9807543dc0954877b7226f751ec1294a869"
],
"version": "==0.24.1"
"sha256:071e42b89b57baa17031af8c6b6bbd2e9a5c68c595bc6bf9adabd7a9ed125d3b",
"sha256:17450e25ae69e2e6b303817bdf26b2cd57f69595d8550a77c308be0cd0fd58fa",
"sha256:17916d818592c9ec891cbef2e90f98cc85e0f1e89ed0924c9b5220dc3209c846",
"sha256:2538f099ab0e9f9c9d09bbcd94b47fd889bad06dc7ae96b1ed583f1dc1a7a822",
"sha256:366f30710172cb45a6b4f43b66c220653b1ea50303fbbd94e50571637ffb9167",
"sha256:42e5ad741a0d09232efbc7fc648226ed93306551772fc8aecc6dce9f0e676794",
"sha256:4e718e7f395ba5bfe8b6f6aaf2ff1c65a09bb77a36af6394621434e7cc813204",
"sha256:4f919f409c433577a501e023943e582c57355d50a724c589e78bc1d551a535a2",
"sha256:4fe0d7e6438212e839fc5010c78b822664f1a824c0d263fd858f44131d9166e2",
"sha256:5149a6db3e74f23dc3f5a216c2c9ae2e12920aa2d4a5b77e44e5b804a5f93248",
"sha256:627594338d6dd995cfc0bacd8e654cd9e1252d2a7c959449228df6740d737eb8",
"sha256:83c702615052f2a0a7fb1dd289726e29ec87a27272d775cb77affe749cca28f8",
"sha256:8c872f7fdf3018b7891e1e3e86c55b190e6c5cee70cab771e8f246c855001296",
"sha256:90f116086063934afd51e61a802a943826d2aac572b2f7d55caaac51c13db5b5",
"sha256:a3352bacac12e1fc646213b998bce586f965c9d431773d9e91db27c7c48a1f7d",
"sha256:bcdd06007cca02d51350f96debe51331dec429ac8f93930a43eb8fb5639e3eb5",
"sha256:c1bd07ebc15285535f61ddd8c0c75d0d6293e80e1ee6d9a8d73f3f36954342d0",
"sha256:c9a4b7c55115eb278c19aa14b34fcf5920c8fe7797a09b7b053ddd6195ea89b3",
"sha256:cc8fc0c7a8d5951dc738f1c1447f71c43734244453616f32b8aa0ef6013a5dfb",
"sha256:d7b460bc316064540ce0c41c1438c416a40746fd8a4fb2999668bf18f3c4acf1"
],
"version": "==0.24.2"
},
"pillow": {
"hashes": [
......@@ -527,10 +527,10 @@
},
"awscli": {
"hashes": [
"sha256:0c146f478dc2a7912b3a8ff0b3478fffd2fd5a8fd00c6150b92790cfbe4374cd",
"sha256:bafa9933795786226808eca02fd403d75cd04184e97c5d6cbcdaeb138e22958d"
"sha256:7b8401cb0979b50c2bde9803550100b1683080dc9b90255b02d00a8eeb55e7a7",
"sha256:b55b5fb1ab8158025bb950a441f987a7114bf4ad487b25ed2498483cbbb4b516"
],
"version": "==1.16.123"
"version": "==1.16.127"
},
"boto": {
"hashes": [
......@@ -541,17 +541,17 @@
},
"boto3": {
"hashes": [
"sha256:90dde7dd4410cb8a0e96d8a880425d9365baa8726e867fe188575342db5b9058",
"sha256:e270308792f4bb6ab52a2b70e9fc5947a1f9819653b5431e51eedae2fb897e96"
"sha256:80f24c01a630e6be409d70aa1b1e30076eda1daf8456157ec210aea2d8d51f2c",
"sha256:f259046902b1daa542a08f08796d000160e9801a87f470faf940addacedcc7d7"
],
"version": "==1.9.113"
"version": "==1.9.117"
},
"botocore": {
"hashes": [
"sha256:351cfd09784bcc26f73ce2f4874f5da6ba28a237fd32803dcc7cdde2d9f8f4a3",
"sha256:77aa19254e95edf93d4b4bd513465a89d2b7f2c08e775344a78b44c0405edc58"
"sha256:6c3b1b3344d7bb53a85d3877047e5f29a46f13deb27bda2e85a6d24d7a27c5bf",
"sha256:c2a8ae81bb2dfd70951279a1b63ba7ef89333675f9ff479b008ce14fcd9872c1"
],
"version": "==1.12.113"
"version": "==1.12.117"
},
"btrees": {
"hashes": [
......@@ -852,10 +852,10 @@
"grpc"
],
"hashes": [
"sha256:3157625b4f4f033650c6e674d52fd8a3a8c116b26b39705cddf4ed61621c09ff",
"sha256:c6d834143a2bea4de8d1161b5460fd362457db40c55ea9ccbe672e5602e330af"
"sha256:25e20c24395439dffcdb6e364cc6adb9b28a9e28d516ef5a51b9266ae0894a44",
"sha256:b1fce5000657dfa4d2ed3a7c94addf9c74fc3e632c7b0e8611b0e8519d1e610a"
],
"version": "==1.8.0"
"version": "==1.8.1"
},
"google-auth": {
"hashes": [
......@@ -866,11 +866,11 @@
},
"google-cloud-pubsub": {
"hashes": [
"sha256:32dbaf9b8c16d4a14b7e1eca2805689f82f69f542a68bf1516b9c77a3ef54b73",
"sha256:4186386aec02752e982eeb1e399d76f1cf70eed56312934df04bfa68d8cfabf0"
"sha256:0df0fecb21ae05d313c0c3ff9923bef8f863b1d62455f9254c8c74915f585042",
"sha256:1e89df2a19c52d9ea7c7cc84e5c51518cabd41a2b74de6fcd55c90ea9a3c4479"
],
"index": "pypi",
"version": "==0.39.1"
"version": "==0.40.0"
},
"googleapis-common-protos": {
"extras": [
......@@ -1002,7 +1002,7 @@
"ludoj-scraper": {
"editable": true,
"git": "https://gitlab.com/mshepherd/ludoj-scraper.git",
"ref": "75145e8f15da77618ac8e1f0489dc845c5bb3828"
"ref": "94981faac68f0ae0df84d7e6ce4911459e593b53"
},
"lxml": {
"hashes": [
......
......@@ -294,7 +294,7 @@ def split(
@task()
def link(
gazetteer=os.path.join(SCRAPER_DIR, 'cluster', 'gazetteer.pickle'),
gazetteer=os.path.join(BASE_DIR, 'cluster', 'gazetteer.pickle'),
paths=(
os.path.join(SCRAPED_DATA_DIR, 'scraped', 'bgg_GameItem.jl'),
os.path.join(SCRAPED_DATA_DIR, 'scraped', 'bga_GameItem.jl'),
......@@ -304,7 +304,7 @@ def link(
),
id_prefixes=('bgg', 'bga', 'spielen', 'luding', 'wikidata'),
threshold=None,
recall_weight=.627,
recall_weight=.5,
output=os.path.join(SCRAPED_DATA_DIR, 'links.json'),
):
''' link items '''
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment