From 69a3a66e7a3fbfbbcc57703949b3782c8576c021 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Sun, 18 Sep 2022 18:58:20 +0200 Subject: Update deps --- poetry.lock | 98 ++++++++++++++++++++-------------------------------------- pyproject.toml | 6 ++-- 2 files changed, 36 insertions(+), 68 deletions(-) diff --git a/poetry.lock b/poetry.lock index f561a1b..aa05174 100644 --- a/poetry.lock +++ b/poetry.lock @@ -179,7 +179,7 @@ python-versions = "*" name = "bandit" version = "1.7.4" description = "Security oriented static analyser for python code." -category = "main" +category = "dev" optional = false python-versions = ">=3.7" @@ -265,7 +265,7 @@ python-versions = "~=3.7" [[package]] name = "certifi" -version = "2022.6.15.1" +version = "2022.9.14" description = "Python package for providing Mozilla's CA Bundle." category = "dev" optional = false @@ -308,7 +308,7 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""} name = "colorama" version = "0.4.5" description = "Cross-platform colored terminal text." -category = "main" +category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" @@ -440,7 +440,7 @@ devel = ["colorama", "jsonschema", "json-spec", "pylint", "pytest", "pytest-benc name = "flake8" version = "5.0.4" description = "the modular source code checker: pep8 pyflakes and co" -category = "main" +category = "dev" optional = false python-versions = ">=3.6.1" @@ -465,7 +465,7 @@ flake8 = ">=3.7" name = "flake8-bandit" version = "4.1.1" description = "Automated security testing with bandit and flake8." -category = "main" +category = "dev" optional = false python-versions = ">=3.6" @@ -605,7 +605,7 @@ smmap = ">=3.0.1,<6" name = "gitpython" version = "3.1.27" description = "GitPython is a python library used to interact with Git repositories" -category = "main" +category = "dev" optional = false python-versions = ">=3.7" @@ -687,7 +687,7 @@ packaging = "*" [[package]] name = "idna" -version = "3.3" +version = "3.4" description = "Internationalized Domain Names in Applications (IDNA)" category = "dev" optional = false @@ -711,7 +711,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest- [[package]] name = "ipykernel" -version = "6.15.2" +version = "6.15.3" description = "IPython Kernel for Jupyter" category = "dev" optional = false @@ -960,7 +960,7 @@ test = ["coverage", "ipykernel", "pre-commit", "pytest-console-scripts", "pytest [[package]] name = "jupyterlab" -version = "3.4.6" +version = "3.4.7" description = "JupyterLab computational environment" category = "dev" optional = false @@ -975,6 +975,7 @@ jupyterlab-server = ">=2.10,<3.0" nbclassic = "*" notebook = "<7" packaging = "*" +tomli = "*" tornado = ">=6.1.0" [package.extras] @@ -1252,7 +1253,7 @@ webpdf = ["pyppeteer (>=1,<1.1)"] [[package]] name = "nbformat" -version = "5.4.0" +version = "5.5.0" description = "The Jupyter Notebook format" category = "dev" optional = false @@ -1261,11 +1262,11 @@ python-versions = ">=3.7" [package.dependencies] fastjsonschema = "*" jsonschema = ">=2.6" -jupyter-core = "*" +jupyter_core = "*" traitlets = ">=5.1" [package.extras] -test = ["check-manifest", "testpath", "pytest", "pre-commit"] +test = ["check-manifest", "testpath", "pytest", "pre-commit", "pep440"] [[package]] name = "nest-asyncio" @@ -1441,7 +1442,7 @@ python-versions = "*" name = "pbr" version = "5.10.0" description = "Python Build Reasonableness" -category = "main" +category = "dev" optional = false python-versions = ">=2.6" @@ -1537,7 +1538,7 @@ wcwidth = "*" [[package]] name = "protobuf" -version = "3.19.4" +version = "3.19.5" description = "Protocol Buffers" category = "dev" optional = false @@ -1741,7 +1742,7 @@ six = ">=1.5" [[package]] name = "pytorch-lightning" -version = "1.7.5" +version = "1.7.6" description = "PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate." category = "dev" optional = false @@ -1800,7 +1801,7 @@ python-versions = ">=3.7" name = "pyyaml" version = "6.0" description = "YAML parser and emitter for Python" -category = "main" +category = "dev" optional = false python-versions = ">=3.6" @@ -1854,7 +1855,7 @@ test = ["pytest-qt", "pytest-cov (>=3.0.0)", "pytest (>=6,!=7.0.0,!=7.0.1)"] [[package]] name = "regex" -version = "2022.8.17" +version = "2022.9.13" description = "Alternative regular expression module, to replace re." category = "dev" optional = false @@ -2100,7 +2101,7 @@ tests = ["cython", "littleutils", "pygments", "typeguard", "pytest"] name = "stevedore" version = "4.0.0" description = "Manage dynamic plugins for Python applications" -category = "main" +category = "dev" optional = false python-versions = ">=3.8" @@ -2280,7 +2281,7 @@ telegram = ["requests"] [[package]] name = "traitlets" -version = "5.3.0" +version = "5.4.0" description = "" category = "dev" optional = false @@ -2332,7 +2333,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "wandb" -version = "0.12.21" +version = "0.12.16" description = "A CLI and library for interacting with the Weights and Biases API." category = "dev" optional = false @@ -2344,8 +2345,9 @@ docker-pycreds = ">=0.4.0" GitPython = ">=1.0.0" pathtools = "*" promise = ">=2.0,<3" -protobuf = ">=3.12.0,<4.0dev" +protobuf = ">=3.12.0" psutil = ">=5.0.0" +python-dateutil = ">=2.6.1" PyYAML = "*" requests = ">=2.0.0,<3" sentry-sdk = ">=1.0.0" @@ -2362,8 +2364,7 @@ grpc = ["grpcio (>=1.27.2)"] kubeflow = ["kubernetes", "minio", "google-cloud-storage", "sh"] launch = ["nbconvert", "nbformat", "chardet", "iso8601", "typing-extensions", "boto3", "google-cloud-storage", "kubernetes"] media = ["numpy", "moviepy", "pillow", "bokeh", "soundfile", "plotly", "rdkit-pypi"] -models = ["cloudpickle"] -sweeps = ["sweeps (>=0.1.0)"] +sweeps = ["numpy (>=1.15,<1.21)", "scipy (>=1.5.4)", "pyyaml", "scikit-learn (==0.24.1)", "jsonschema (>=3.2.0)", "jsonref (>=0.2)", "pydantic (>=1.8.2)"] [[package]] name = "wcwidth" @@ -2468,7 +2469,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest- [metadata] lock-version = "1.1" python-versions = "^3.9" -content-hash = "ef2b611ae5f2635544d2bef459eae9d06c1f8baf81f6959e2fb0356a035b720d" +content-hash = "9e7ac937cbd46e049be42239469a50e675fa322cad7e782eedb47454e5457a91" [metadata.files] absl-py = [] @@ -2807,10 +2808,7 @@ hydra-core = [ {file = "hydra-core-1.2.0.tar.gz", hash = "sha256:4990721ce4ac69abafaffee566d6b63a54faa6501ecce65b338d3251446ff634"}, {file = "hydra_core-1.2.0-py3-none-any.whl", hash = "sha256:b6614fd6d6a97a9499f7ddbef02c9dd38f2fec6a9bc83c10e248db1dae50a528"}, ] -idna = [ - {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, - {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, -] +idna = [] importlib-metadata = [ {file = "importlib_metadata-4.12.0-py3-none-any.whl", hash = "sha256:7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23"}, {file = "importlib_metadata-4.12.0.tar.gz", hash = "sha256:637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670"}, @@ -2996,10 +2994,7 @@ mypy-extensions = [ nbclassic = [] nbclient = [] nbconvert = [] -nbformat = [ - {file = "nbformat-5.4.0-py3-none-any.whl", hash = "sha256:0d6072aaec95dddc39735c144ee8bbc6589c383fb462e4058abc855348152dad"}, - {file = "nbformat-5.4.0.tar.gz", hash = "sha256:44ba5ca6acb80c5d5a500f1e5b83ede8cbe364d5a495c4c8cf60aaf1ba656501"}, -] +nbformat = [] nest-asyncio = [ {file = "nest_asyncio-1.5.5-py3-none-any.whl", hash = "sha256:b98e3ec1b246135e4642eceffa5a6c23a3ab12c82ff816a92c612d68205813b2"}, {file = "nest_asyncio-1.5.5.tar.gz", hash = "sha256:e442291cd942698be619823a17a86a5759eabe1f8613084790de189fe9e16d65"}, @@ -3070,34 +3065,7 @@ promise = [ {file = "promise-2.3.tar.gz", hash = "sha256:dfd18337c523ba4b6a58801c164c1904a9d4d1b1747c7d5dbf45b693a49d93d0"}, ] prompt-toolkit = [] -protobuf = [ - {file = "protobuf-3.19.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:f51d5a9f137f7a2cec2d326a74b6e3fc79d635d69ffe1b036d39fc7d75430d37"}, - {file = "protobuf-3.19.4-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:09297b7972da685ce269ec52af761743714996b4381c085205914c41fcab59fb"}, - {file = "protobuf-3.19.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:072fbc78d705d3edc7ccac58a62c4c8e0cec856987da7df8aca86e647be4e35c"}, - {file = "protobuf-3.19.4-cp310-cp310-win32.whl", hash = "sha256:7bb03bc2873a2842e5ebb4801f5c7ff1bfbdf426f85d0172f7644fcda0671ae0"}, - {file = "protobuf-3.19.4-cp310-cp310-win_amd64.whl", hash = "sha256:f358aa33e03b7a84e0d91270a4d4d8f5df6921abe99a377828839e8ed0c04e07"}, - {file = "protobuf-3.19.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:1c91ef4110fdd2c590effb5dca8fdbdcb3bf563eece99287019c4204f53d81a4"}, - {file = "protobuf-3.19.4-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c438268eebb8cf039552897d78f402d734a404f1360592fef55297285f7f953f"}, - {file = "protobuf-3.19.4-cp36-cp36m-win32.whl", hash = "sha256:835a9c949dc193953c319603b2961c5c8f4327957fe23d914ca80d982665e8ee"}, - {file = "protobuf-3.19.4-cp36-cp36m-win_amd64.whl", hash = "sha256:4276cdec4447bd5015453e41bdc0c0c1234eda08420b7c9a18b8d647add51e4b"}, - {file = "protobuf-3.19.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6cbc312be5e71869d9d5ea25147cdf652a6781cf4d906497ca7690b7b9b5df13"}, - {file = "protobuf-3.19.4-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:54a1473077f3b616779ce31f477351a45b4fef8c9fd7892d6d87e287a38df368"}, - {file = "protobuf-3.19.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:435bb78b37fc386f9275a7035fe4fb1364484e38980d0dd91bc834a02c5ec909"}, - {file = "protobuf-3.19.4-cp37-cp37m-win32.whl", hash = "sha256:16f519de1313f1b7139ad70772e7db515b1420d208cb16c6d7858ea989fc64a9"}, - {file = "protobuf-3.19.4-cp37-cp37m-win_amd64.whl", hash = "sha256:cdc076c03381f5c1d9bb1abdcc5503d9ca8b53cf0a9d31a9f6754ec9e6c8af0f"}, - {file = "protobuf-3.19.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:69da7d39e39942bd52848438462674c463e23963a1fdaa84d88df7fbd7e749b2"}, - {file = "protobuf-3.19.4-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:48ed3877fa43e22bcacc852ca76d4775741f9709dd9575881a373bd3e85e54b2"}, - {file = "protobuf-3.19.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bd95d1dfb9c4f4563e6093a9aa19d9c186bf98fa54da5252531cc0d3a07977e7"}, - {file = "protobuf-3.19.4-cp38-cp38-win32.whl", hash = "sha256:b38057450a0c566cbd04890a40edf916db890f2818e8682221611d78dc32ae26"}, - {file = "protobuf-3.19.4-cp38-cp38-win_amd64.whl", hash = "sha256:7ca7da9c339ca8890d66958f5462beabd611eca6c958691a8fe6eccbd1eb0c6e"}, - {file = "protobuf-3.19.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:36cecbabbda242915529b8ff364f2263cd4de7c46bbe361418b5ed859677ba58"}, - {file = "protobuf-3.19.4-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:c1068287025f8ea025103e37d62ffd63fec8e9e636246b89c341aeda8a67c934"}, - {file = "protobuf-3.19.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:96bd766831596d6014ca88d86dc8fe0fb2e428c0b02432fd9db3943202bf8c5e"}, - {file = "protobuf-3.19.4-cp39-cp39-win32.whl", hash = "sha256:84123274d982b9e248a143dadd1b9815049f4477dc783bf84efe6250eb4b836a"}, - {file = "protobuf-3.19.4-cp39-cp39-win_amd64.whl", hash = "sha256:3112b58aac3bac9c8be2b60a9daf6b558ca3f7681c130dcdd788ade7c9ffbdca"}, - {file = "protobuf-3.19.4-py2.py3-none-any.whl", hash = "sha256:8961c3a78ebfcd000920c9060a262f082f29838682b1f7201889300c1fbe0616"}, - {file = "protobuf-3.19.4.tar.gz", hash = "sha256:9df0c10adf3e83015ced42a9a7bd64e13d06c4cf45c340d2c63020ea04499d0a"}, -] +protobuf = [] psutil = [] ptyprocess = [ {file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"}, @@ -3380,10 +3348,7 @@ torchvision = [ ] tornado = [] tqdm = [] -traitlets = [ - {file = "traitlets-5.3.0-py3-none-any.whl", hash = "sha256:65fa18961659635933100db8ca120ef6220555286949774b9cfc106f941d1c7a"}, - {file = "traitlets-5.3.0.tar.gz", hash = "sha256:0bb9f1f9f017aa8ec187d8b1b2a7a6626a2a1d877116baba52a129bfa124f8e2"}, -] +traitlets = [] typed-ast = [ {file = "typed_ast-1.4.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:2068531575a125b87a41802130fa7e29f26c09a2833fea68d9a40cf33902eba6"}, {file = "typed_ast-1.4.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:c907f561b1e83e93fad565bac5ba9c22d96a54e7ea0267c708bffe863cbe4075"}, @@ -3422,7 +3387,10 @@ typeguard = [ ] typing-extensions = [] urllib3 = [] -wandb = [] +wandb = [ + {file = "wandb-0.12.16-py2.py3-none-any.whl", hash = "sha256:ed7782dadfb5bc457998eccd995f88ae564cdf2a36b12024e4a5d9a47b1b84e8"}, + {file = "wandb-0.12.16.tar.gz", hash = "sha256:a738b5eb61081fa96fc2e16ffaf6dbde67b78f973ff45bda61ed93659ca09912"}, +] wcwidth = [ {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"}, {file = "wcwidth-0.2.5.tar.gz", hash = "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"}, diff --git a/pyproject.toml b/pyproject.toml index 64ae18b..89cc761 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ python = "^3.9" loguru = "^0.6.0" omegaconf = "^2.1.0" einops = "^0.3.0" -pytorch-lightning = "^1.7.5" +pytorch-lightning = "^1.7.6" hydra-core = "^1.1.1" smart-open = "^5.2.1" torch = "^1.11.0" @@ -22,7 +22,7 @@ torchvision = "^0.12.0" adan-pytorch = "^0.1.0" torchmetrics = "^0.9.3" -[tool.poetry.dev-dependencies] +[tool.poetry.group.dev.dependencies] pytest = "^5.4.2" coverage = { extras = ["toml"], version = "^5.1" } pytest-cov = "^2.9.0" @@ -31,7 +31,7 @@ flake8 = "^5.0.4" safety = "^1.9.0" mypy = "^0.770" typeguard = "^2.7.1" -wandb = "^0.12.16" +wandb = "0.12.16" scipy = "^1.6.1" jupyterlab = "^3.0.15" ipywidgets = "^7.6.3" -- cgit v1.2.3-70-g09d2