From ff68e29136e7294a29d16c6af1f25e874a690cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Thu, 27 Oct 2022 13:47:52 +0200 Subject: [PATCH] fix: numpy install issue with python < 3.10 --- .github/workflows/instance_test.yml | 1 - .github/workflows/mypy.yml | 1 - poetry.lock | 59 ++++++++++++++++++++++++----- pyproject.toml | 4 +- 4 files changed, 51 insertions(+), 14 deletions(-) diff --git a/.github/workflows/instance_test.yml b/.github/workflows/instance_test.yml index 7c65b11..33e6d72 100644 --- a/.github/workflows/instance_test.yml +++ b/.github/workflows/instance_test.yml @@ -48,7 +48,6 @@ jobs: echo LOOKYLOO_HOME="'`pwd`'" > .env cp config/generic.json.sample config/generic.json cp config/modules.json.sample config/modules.json - poetry run pip install -U numpy poetry install -vvv poetry run playwright install poetry run tools/validate_config_files.py --check diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index ea78e63..0f12117 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -30,7 +30,6 @@ jobs: - name: Install dependencies run: | sudo apt install libfuzzy-dev - poetry run pip install -U numpy poetry install echo LOOKYLOO_HOME="`pwd`" >> .env poetry run tools/3rdparty.py diff --git a/poetry.lock b/poetry.lock index e7530bf..904c89a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -409,11 +409,11 @@ tornado = ["tornado (>=0.2)"] [[package]] name = "har2tree" -version = "1.15.6" +version = "1.16.0" description = "HTTP Archive (HAR) to ETE Toolkit generator" category = "main" optional = false -python-versions = ">=3.8,<3.11" +python-versions = ">=3.8,<3.12" [package.dependencies] beautifulsoup4 = ">=4.11.1,<5.0.0" @@ -421,13 +421,16 @@ cchardet = ">=2.1.7,<3.0.0" ete3 = ">=3.1.2,<4.0.0" filetype = ">=1.1.0,<2.0.0" lxml = ">=4.9.1,<5.0.0" -numpy = ">=1.23.3,<2.0.0" +numpy = [ + {version = "1.23.3", markers = "python_version < \"3.10\""}, + {version = ">=1.23.4,<2.0.0", markers = "python_version >= \"3.10\""}, +] publicsuffix2 = ">=2.20191221,<3.0" six = ">=1.16.0,<2.0.0" w3lib = ">=2.0.1,<3.0.0" [package.extras] -docs = ["Sphinx (>=5.1.1,<6.0.0)"] +docs = ["Sphinx (>=5.3.0,<6.0.0)"] [[package]] name = "hiredis" @@ -568,7 +571,7 @@ format-nongpl = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339- [[package]] name = "lacuscore" -version = "1.1.0" +version = "1.1.1" description = "Core of Lacus, usable as a module" category = "main" optional = false @@ -659,6 +662,14 @@ category = "dev" optional = false python-versions = "*" +[[package]] +name = "numpy" +version = "1.23.3" +description = "NumPy is the fundamental package for array computing with Python." +category = "main" +optional = false +python-versions = ">=3.8" + [[package]] name = "numpy" version = "1.23.4" @@ -1465,7 +1476,7 @@ misp = ["python-magic", "pydeep2"] [metadata] lock-version = "1.1" python-versions = ">=3.8,<3.11" -content-hash = "bf546807862f1301a4ba924ad653e8b54cfde11221fe12c25bf6fa9c886aae62" +content-hash = "7b37a5eaf62e9f1e0cc99e77699dbd402f38a7ccf1ede62318975307ae24b7c8" [metadata.files] aiohttp = [ @@ -1841,8 +1852,8 @@ gunicorn = [ {file = "gunicorn-20.1.0.tar.gz", hash = "sha256:e0a968b5ba15f8a328fdfd7ab1fcb5af4470c28aaf7e55df02a99bc13138e6e8"}, ] har2tree = [ - {file = "har2tree-1.15.6-py3-none-any.whl", hash = "sha256:8e7aa5bfe44a455568c658f5b98815c1f383f6898fea654ae92f8bfad6f72232"}, - {file = "har2tree-1.15.6.tar.gz", hash = "sha256:362eac8df6551df2c8b3d497ddf43d80eec88c10b3990b1f577717a529c406a0"}, + {file = "har2tree-1.16.0-py3-none-any.whl", hash = "sha256:f006eb79c4200671193573af22bfded7e3a37c9ffd410b7c1290d6003b0494cb"}, + {file = "har2tree-1.16.0.tar.gz", hash = "sha256:6e52299b20b94ea9afe3d687524551a416c60cb9cf90ddfed31b2ad4f13ec6b0"}, ] hiredis = [ {file = "hiredis-2.0.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:b4c8b0bc5841e578d5fb32a16e0c305359b987b850a06964bd5a62739d688048"}, @@ -1920,8 +1931,8 @@ jsonschema = [ {file = "jsonschema-4.16.0.tar.gz", hash = "sha256:165059f076eff6971bae5b742fc029a7b4ef3f9bcf04c14e4776a7605de14b23"}, ] lacuscore = [ - {file = "lacuscore-1.1.0-py3-none-any.whl", hash = "sha256:69262ce3d08d7f39a6171db3b83877d913498b3d01b8e45be7eaeb338a98424c"}, - {file = "lacuscore-1.1.0.tar.gz", hash = "sha256:23301b063e8d2a3ffd33e85ca00e590fc56b634d2de690ec8176cf56b084589f"}, + {file = "lacuscore-1.1.1-py3-none-any.whl", hash = "sha256:bef70fd371863fc4641360903d94c84608597d3155018ceae8b11e002b741af2"}, + {file = "lacuscore-1.1.1.tar.gz", hash = "sha256:a94d5f7876b6b01b5a3593a8bd4af35e8dcd644e64351f150b3a590df70e7895"}, ] lief = [ {file = "lief-0.12.2-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:cdadaab4b9ec756e1d1f0324acd6e280ae849d251e66f836da455df592deaf9e"}, @@ -2159,6 +2170,34 @@ mypy-extensions = [ {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, ] numpy = [ + {file = "numpy-1.23.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c9f707b5bb73bf277d812ded9896f9512a43edff72712f31667d0a8c2f8e71ee"}, + {file = "numpy-1.23.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffcf105ecdd9396e05a8e58e81faaaf34d3f9875f137c7372450baa5d77c9a54"}, + {file = "numpy-1.23.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0ea3f98a0ffce3f8f57675eb9119f3f4edb81888b6874bc1953f91e0b1d4f440"}, + {file = "numpy-1.23.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:004f0efcb2fe1c0bd6ae1fcfc69cc8b6bf2407e0f18be308612007a0762b4089"}, + {file = "numpy-1.23.3-cp310-cp310-win32.whl", hash = "sha256:98dcbc02e39b1658dc4b4508442a560fe3ca5ca0d989f0df062534e5ca3a5c1a"}, + {file = "numpy-1.23.3-cp310-cp310-win_amd64.whl", hash = "sha256:39a664e3d26ea854211867d20ebcc8023257c1800ae89773cbba9f9e97bae036"}, + {file = "numpy-1.23.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1f27b5322ac4067e67c8f9378b41c746d8feac8bdd0e0ffede5324667b8a075c"}, + {file = "numpy-1.23.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2ad3ec9a748a8943e6eb4358201f7e1c12ede35f510b1a2221b70af4bb64295c"}, + {file = "numpy-1.23.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bdc9febce3e68b697d931941b263c59e0c74e8f18861f4064c1f712562903411"}, + {file = "numpy-1.23.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:301c00cf5e60e08e04d842fc47df641d4a181e651c7135c50dc2762ffe293dbd"}, + {file = "numpy-1.23.3-cp311-cp311-win32.whl", hash = "sha256:7cd1328e5bdf0dee621912f5833648e2daca72e3839ec1d6695e91089625f0b4"}, + {file = "numpy-1.23.3-cp311-cp311-win_amd64.whl", hash = "sha256:8355fc10fd33a5a70981a5b8a0de51d10af3688d7a9e4a34fcc8fa0d7467bb7f"}, + {file = "numpy-1.23.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bc6e8da415f359b578b00bcfb1d08411c96e9a97f9e6c7adada554a0812a6cc6"}, + {file = "numpy-1.23.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:22d43376ee0acd547f3149b9ec12eec2f0ca4a6ab2f61753c5b29bb3e795ac4d"}, + {file = "numpy-1.23.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a64403f634e5ffdcd85e0b12c08f04b3080d3e840aef118721021f9b48fc1460"}, + {file = "numpy-1.23.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:efd9d3abe5774404becdb0748178b48a218f1d8c44e0375475732211ea47c67e"}, + {file = "numpy-1.23.3-cp38-cp38-win32.whl", hash = "sha256:f8c02ec3c4c4fcb718fdf89a6c6f709b14949408e8cf2a2be5bfa9c49548fd85"}, + {file = "numpy-1.23.3-cp38-cp38-win_amd64.whl", hash = "sha256:e868b0389c5ccfc092031a861d4e158ea164d8b7fdbb10e3b5689b4fc6498df6"}, + {file = "numpy-1.23.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:09f6b7bdffe57fc61d869a22f506049825d707b288039d30f26a0d0d8ea05164"}, + {file = "numpy-1.23.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8c79d7cf86d049d0c5089231a5bcd31edb03555bd93d81a16870aa98c6cfb79d"}, + {file = "numpy-1.23.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e5d5420053bbb3dd64c30e58f9363d7a9c27444c3648e61460c1237f9ec3fa14"}, + {file = "numpy-1.23.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5422d6a1ea9b15577a9432e26608c73a78faf0b9039437b075cf322c92e98e7"}, + {file = "numpy-1.23.3-cp39-cp39-win32.whl", hash = "sha256:c1ba66c48b19cc9c2975c0d354f24058888cdc674bebadceb3cdc9ec403fb5d1"}, + {file = "numpy-1.23.3-cp39-cp39-win_amd64.whl", hash = "sha256:78a63d2df1d947bd9d1b11d35564c2f9e4b57898aae4626638056ec1a231c40c"}, + {file = "numpy-1.23.3-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:17c0e467ade9bda685d5ac7f5fa729d8d3e76b23195471adae2d6a6941bd2c18"}, + {file = "numpy-1.23.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:91b8d6768a75247026e951dce3b2aac79dc7e78622fc148329135ba189813584"}, + {file = "numpy-1.23.3-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:94c15ca4e52671a59219146ff584488907b1f9b3fc232622b47e2cf832e94fb8"}, + {file = "numpy-1.23.3.tar.gz", hash = "sha256:51bf49c0cd1d52be0a240aa66f3458afc4b95d8993d2d04f0d91fa60c10af6cd"}, {file = "numpy-1.23.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:95d79ada05005f6f4f337d3bb9de8a7774f259341c70bc88047a1f7b96a4bcb2"}, {file = "numpy-1.23.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:926db372bc4ac1edf81cfb6c59e2a881606b409ddc0d0920b988174b2e2a767f"}, {file = "numpy-1.23.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c237129f0e732885c9a6076a537e974160482eab8f10db6292e92154d4c67d71"}, diff --git a/pyproject.toml b/pyproject.toml index 7bb0d17..545dbae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,12 +62,12 @@ pyhashlookup = "^1.2.1" lief = "^0.12.2" ua-parser = "^0.16.1" Flask-Login = "^0.6.2" -har2tree = "^1.15.6" +har2tree = "^1.16.0" passivetotal = "^2.5.9" werkzeug = "2.1.2" filetype = "^1.1.0" pypandora = "^1.1.2" -lacuscore = "^1.1.0" +lacuscore = "^1.1.1" pylacus = "^1.1.0" [tool.poetry.extras]