From f68bc30c424ec24c65950956740c2a82c1fde35b Mon Sep 17 00:00:00 2001 From: Kevin Schaper Date: Tue, 17 Sep 2024 11:14:50 -0700 Subject: [PATCH 1/2] Swap spacy from using a git dependency in poetry to pypi --- backend/poetry.lock | 43 ++++++++++++++++++++++++++++-------------- backend/pyproject.toml | 2 +- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/backend/poetry.lock b/backend/poetry.lock index 22fc358f5..6db9bbe50 100644 --- a/backend/poetry.lock +++ b/backend/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "airium" @@ -1906,9 +1906,13 @@ files = [ {file = "lxml-5.2.2-cp36-cp36m-win_amd64.whl", hash = "sha256:edcfa83e03370032a489430215c1e7783128808fd3e2e0a3225deee278585196"}, {file = "lxml-5.2.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:28bf95177400066596cdbcfc933312493799382879da504633d16cf60bba735b"}, {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3a745cc98d504d5bd2c19b10c79c61c7c3df9222629f1b6210c0368177589fb8"}, + {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1b590b39ef90c6b22ec0be925b211298e810b4856909c8ca60d27ffbca6c12e6"}, {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b336b0416828022bfd5a2e3083e7f5ba54b96242159f83c7e3eebaec752f1716"}, + {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:c2faf60c583af0d135e853c86ac2735ce178f0e338a3c7f9ae8f622fd2eb788c"}, {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:4bc6cb140a7a0ad1f7bc37e018d0ed690b7b6520ade518285dc3171f7a117905"}, + {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7ff762670cada8e05b32bf1e4dc50b140790909caa8303cfddc4d702b71ea184"}, {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:57f0a0bbc9868e10ebe874e9f129d2917750adf008fe7b9c1598c0fbbfdde6a6"}, + {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_2_aarch64.whl", hash = "sha256:a6d2092797b388342c1bc932077ad232f914351932353e2e8706851c870bca1f"}, {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:60499fe961b21264e17a471ec296dcbf4365fbea611bf9e303ab69db7159ce61"}, {file = "lxml-5.2.2-cp37-cp37m-win32.whl", hash = "sha256:d9b342c76003c6b9336a80efcc766748a333573abf9350f4094ee46b006ec18f"}, {file = "lxml-5.2.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b16db2770517b8799c79aa80f4053cd6f8b716f21f8aca962725a9565ce3ee40"}, @@ -4071,12 +4075,29 @@ files = [ [[package]] name = "spacy" -version = "3.7.5" +version = "3.7.6" description = "Industrial-strength Natural Language Processing (NLP) in Python" optional = false python-versions = ">=3.7" -files = [] -develop = false +files = [ + {file = "spacy-3.7.6-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8b0862280d10b063faffab597225f53873a790d02634dedfaffb70fb696b70a0"}, + {file = "spacy-3.7.6-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c0d2c95e8f5199dde9d52b447f7422ee0f8584e9374e072305fd88372885b1b1"}, + {file = "spacy-3.7.6-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:daa97002da3762b620fcda0e71d43352b6e2b324c2cbaa389e88f4ba41d1c2a4"}, + {file = "spacy-3.7.6-cp310-cp310-win_amd64.whl", hash = "sha256:f885e2d2619271754d52e3685ff3c75e171a192271a79d7e41a13f8106b48129"}, + {file = "spacy-3.7.6-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:dd1627b31088906527250cd713b0cdc3c0fa98f473952ae084bd6ce8465890ab"}, + {file = "spacy-3.7.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a400d49e9c2777144f0d2071dfdf4778d99577d47b3cc81cefe0b1360b10186"}, + {file = "spacy-3.7.6-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:cc1bca41ee4d5c21a93f9e7a901dd54518d3bc52ca9c301c65341ac44323b552"}, + {file = "spacy-3.7.6-cp311-cp311-win_amd64.whl", hash = "sha256:26fd3cb23dfb25e300398800685b04621d6ffabe4c1e09dd168fea13bb97e81d"}, + {file = "spacy-3.7.6-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:0bd0cd697ca3982f8570c5cc6c736c6529d9989b9d554a05711f7035d2611da1"}, + {file = "spacy-3.7.6-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:199a1c10e4f86521a109b2b5b6daccced6a93f866d2ba2f1fd46bd49c37d8a2a"}, + {file = "spacy-3.7.6-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:be8ae014c1975892dd664a9c9ea8555141c84219b2fc8ff112f591f8581993ab"}, + {file = "spacy-3.7.6-cp312-cp312-win_amd64.whl", hash = "sha256:8bd03611b05f33d9500bb4244a6f6115e15907d643593468496348bb25fe8c3a"}, + {file = "spacy-3.7.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bc31b4bc4af6469c8a5504410b9fe5d90d24bbab2a7f96d6f8d1a432a035c0f3"}, + {file = "spacy-3.7.6-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0816fccc72bb188bf75ea2acf9d60179a8b6393e3565bfdf0a30b5b66d03a521"}, + {file = "spacy-3.7.6-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:5404bd109eb11c4e8bc7ee610aa40abb934b3dcd75f8309984d5667e2402b0e6"}, + {file = "spacy-3.7.6-cp39-cp39-win_amd64.whl", hash = "sha256:1c4f994f799c2c56cad47ed5402585b826c4d420037c9bf782719f420b6022c8"}, + {file = "spacy-3.7.6.tar.gz", hash = "sha256:f4065c0aac5c48bbfb2ffe191d55ccb33bfb005376afbd4ccd6d5e9341514e34"}, +] [package.dependencies] catalogue = ">=2.0.6,<2.1.0" @@ -4120,17 +4141,11 @@ cuda80 = ["cupy-cuda80 (>=5.0.0b4,<13.0.0)"] cuda90 = ["cupy-cuda90 (>=5.0.0b4,<13.0.0)"] cuda91 = ["cupy-cuda91 (>=5.0.0b4,<13.0.0)"] cuda92 = ["cupy-cuda92 (>=5.0.0b4,<13.0.0)"] -ja = ["sudachidict_core (>=20211220)", "sudachipy (>=0.5.2,!=0.6.1)"] +ja = ["sudachidict-core (>=20211220)", "sudachipy (>=0.5.2,!=0.6.1)"] ko = ["natto-py (>=0.9.0)"] -lookups = ["spacy_lookups_data (>=1.0.3,<1.1.0)"] +lookups = ["spacy-lookups-data (>=1.0.3,<1.1.0)"] th = ["pythainlp (>=2.0)"] -transformers = ["spacy_transformers (>=1.1.2,<1.4.0)"] - -[package.source] -type = "git" -url = "https://github.com/explosion/spaCy.git" -reference = "master" -resolved_reference = "82fc2ecfa521f6c2aa8e77d2750b81a0c90e4580" +transformers = ["spacy-transformers (>=1.1.2,<1.4.0)"] [[package]] name = "spacy-legacy" @@ -5323,4 +5338,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "0b6e5020d2673fd2a9c4cb007b5c8f372980c67a6f5e87a3dd2028d88cd58586" +content-hash = "68d50837c30fbb81c95be058e170382667c6f07d7fec7c4d75e65e53d09f0297" diff --git a/backend/pyproject.toml b/backend/pyproject.toml index 728beef47..e764024c9 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -33,8 +33,8 @@ rich = "*" # typer = "^0.12" typer = "^0.7.0" typer-cli = "^0.0.13" -spacy = { git = "https://github.com/explosion/spaCy.git", branch = "master" } beautifulsoup4 = "^4.12.3" +spacy = "^3.7.6" [tool.poetry.dependencies.en_core_sci_sm] url = "https://s3-us-west-2.amazonaws.com/ai2-s2-scispacy/releases/v0.5.4/en_core_sci_sm-0.5.4.tar.gz" From aee95f13e54b82c87f19771c94253fd77943ee13 Mon Sep 17 00:00:00 2001 From: Kevin Schaper Date: Tue, 17 Sep 2024 12:32:25 -0700 Subject: [PATCH 2/2] Removed a few commented out library lines, mostly a null commit to re-trigger a deploy action --- backend/pyproject.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/pyproject.toml b/backend/pyproject.toml index e764024c9..7319ec737 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -23,14 +23,12 @@ bioregistry = "^0.10.57" oaklib = ">=0.6.6" docker = "^7.1.0" -# fastapi = "^0.111.0" fastapi = "^0.103.1" gunicorn = "^22.0.0" loguru = "*" pystow = ">=0.5.4" requests = "^2.31.0" rich = "*" -# typer = "^0.12" typer = "^0.7.0" typer-cli = "^0.0.13" beautifulsoup4 = "^4.12.3"