From 6eb72a6df1492d4a78dfd19fc2b97b78c00a9e43 Mon Sep 17 00:00:00 2001 From: Charlie Date: Tue, 27 Aug 2024 17:06:15 +0100 Subject: [PATCH] chore: update dependencies --- poetry.lock | 122 +------------------------------ pyproject.toml | 2 - requirements-dev.txt | 6 -- requirements-learning.txt | 6 -- requirements.txt | 15 ---- tests/vega_protos/test_protos.py | 2 + 6 files changed, 4 insertions(+), 149 deletions(-) diff --git a/poetry.lock b/poetry.lock index 106e5554f..2bbb6dce0 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2938,70 +2938,6 @@ files = [ [package.extras] diagrams = ["jinja2", "railroad-diagrams"] -[[package]] -name = "pyqt6" -version = "6.7.1" -description = "Python bindings for the Qt cross platform application toolkit" -optional = false -python-versions = ">=3.8" -files = [ - {file = "PyQt6-6.7.1-1-cp38-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:7f397f4b38b23b5588eb2c0933510deb953d96b1f0323a916c4839c2a66ccccc"}, - {file = "PyQt6-6.7.1-1-cp38-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:c2f202b7941aa74e5c7e1463a6f27d9131dbc1e6cabe85571d7364f5b3de7397"}, - {file = "PyQt6-6.7.1-cp38-abi3-macosx_11_0_universal2.whl", hash = "sha256:f053378e3aef6248fa612c8afddda17f942fb63f9fe8a9aeb2a6b6b4cbb0eba9"}, - {file = "PyQt6-6.7.1-cp38-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:0adb7914c732ad1dee46d9cec838a98cb2b11bc38cc3b7b36fbd8701ae64bf47"}, - {file = "PyQt6-6.7.1-cp38-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2d771fa0981514cb1ee937633dfa64f14caa902707d9afffab66677f3a73e3da"}, - {file = "PyQt6-6.7.1-cp38-abi3-win_amd64.whl", hash = "sha256:fa3954698233fe286a8afc477b84d8517f0788eb46b74da69d3ccc0170d3714c"}, - {file = "PyQt6-6.7.1.tar.gz", hash = "sha256:3672a82ccd3a62e99ab200a13903421e2928e399fda25ced98d140313ad59cb9"}, -] - -[package.dependencies] -PyQt6-Qt6 = ">=6.7.0,<6.8.0" -PyQt6-sip = ">=13.8,<14" - -[[package]] -name = "pyqt6-qt6" -version = "6.7.2" -description = "The subset of a Qt installation needed by PyQt6." -optional = false -python-versions = "*" -files = [ - {file = "PyQt6_Qt6-6.7.2-py3-none-macosx_10_14_x86_64.whl", hash = "sha256:065415589219a2f364aba29d6a98920bb32810286301acbfa157e522d30369e3"}, - {file = "PyQt6_Qt6-6.7.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:7f817efa86a0e8eda9152c85b73405463fbf3266299090f32bbb2266da540ead"}, - {file = "PyQt6_Qt6-6.7.2-py3-none-manylinux_2_28_aarch64.whl", hash = "sha256:05f2c7d195d316d9e678a92ecac0252a24ed175bd2444cc6077441807d756580"}, - {file = "PyQt6_Qt6-6.7.2-py3-none-manylinux_2_28_x86_64.whl", hash = "sha256:fc93945eaef4536d68bd53566535efcbe78a7c05c2a533790a8fd022bac8bfaa"}, - {file = "PyQt6_Qt6-6.7.2-py3-none-win_amd64.whl", hash = "sha256:b2d7e5ddb1b9764cd60f1d730fa7bf7a1f0f61b2630967c81761d3d0a5a8a2e0"}, -] - -[[package]] -name = "pyqt6-sip" -version = "13.8.0" -description = "The sip module support for PyQt6" -optional = false -python-versions = ">=3.8" -files = [ - {file = "PyQt6_sip-13.8.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:cedd554c643e54c4c2e12b5874781a87441a1b405acf3650a4a2e1df42aae231"}, - {file = "PyQt6_sip-13.8.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f57275b5af774529f9838adcfb58869ba3ebdaf805daea113bb0697a96a3f3cb"}, - {file = "PyQt6_sip-13.8.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:835ed22eab977f75fd77e60d4ff308a1fa794b1d0c04849311f36d2a080cdf3b"}, - {file = "PyQt6_sip-13.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:d8b22a6850917c68ce83fc152a8b606ecb2efaaeed35be53110468885d6cdd9d"}, - {file = "PyQt6_sip-13.8.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:b203b6fbae4a8f2d27f35b7df46200057033d9ecd9134bcf30e3eab66d43572c"}, - {file = "PyQt6_sip-13.8.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:beaddc1ec96b342f4e239702f91802706a80cb403166c2da318cec4ad8b790cb"}, - {file = "PyQt6_sip-13.8.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:a5c086b7c9c7996ea9b7522646cc24eebbf3591ec9dd38f65c0a3fdb0dbeaac7"}, - {file = "PyQt6_sip-13.8.0-cp311-cp311-win_amd64.whl", hash = "sha256:dd168667addf01f8a4b0fa7755323e43e4cd12ca4bade558c61f713a5d48ba1a"}, - {file = "PyQt6_sip-13.8.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:33d9b399fc9c9dc99496266842b0fb2735d924604774e97cf9b555667cc0fc59"}, - {file = "PyQt6_sip-13.8.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:056af69d1d8d28d5968066ec5da908afd82fc0be07b67cf2b84b9f02228416ce"}, - {file = "PyQt6_sip-13.8.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:08dd81037a2864982ece2bf9891f3bf4558e247034e112993ea1a3fe239458cb"}, - {file = "PyQt6_sip-13.8.0-cp312-cp312-win_amd64.whl", hash = "sha256:fbb249b82c53180f1420571ece5dc24fea1188ba435923edd055599dffe7abfb"}, - {file = "PyQt6_sip-13.8.0-cp38-cp38-macosx_11_0_universal2.whl", hash = "sha256:6bce6bc5870d9e87efe5338b1ee4a7b9d7d26cdd16a79a5757d80b6f25e71edc"}, - {file = "PyQt6_sip-13.8.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cd81144b0770084e8005d3a121c9382e6f9bc8d0bb320dd618718ffe5090e0e6"}, - {file = "PyQt6_sip-13.8.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:755beb5d271d081e56618fb30342cdd901464f721450495cb7cb0212764da89e"}, - {file = "PyQt6_sip-13.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:7a0bbc0918eab5b6351735d40cf22cbfa5aa2476b55e0d5fe881aeed7d871c29"}, - {file = "PyQt6_sip-13.8.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:7f84c472afdc7d316ff683f63129350d645ef82d9b3fd75a609b08472d1f7291"}, - {file = "PyQt6_sip-13.8.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b1bf29e95f10a8a00819dac804ca7e5eba5fc1769adcd74c837c11477bf81954"}, - {file = "PyQt6_sip-13.8.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:9ea9223c94906efd68148f12ae45b51a21d67e86704225ddc92bce9c54e4d93c"}, - {file = "PyQt6_sip-13.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:2559afa68825d08de09d71c42f3b6ad839dcc30f91e7c6d0785e07830d5541a5"}, - {file = "PyQt6_sip-13.8.0.tar.gz", hash = "sha256:2f74cf3d6d9cab5152bd9f49d570b2dfb87553ebb5c4919abfde27f5b9fd69d4"}, -] - [[package]] name = "pytest" version = "7.4.4" @@ -3155,7 +3091,7 @@ files = [ name = "pyyaml" version = "6.0.1" description = "YAML parser and emitter for Python" -optional = false +optional = true python-versions = ">=3.6" files = [ {file = "PyYAML-6.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a"}, @@ -4089,60 +4025,6 @@ h2 = ["h2 (>=4,<5)"] socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] zstd = ["zstandard (>=0.18.0)"] -[[package]] -name = "vega-python-protos" -version = "0.1.0" -description = "" -optional = false -python-versions = "^3.9,<3.12" -files = [] -develop = false - -[package.dependencies] -black = "^24.4.0" -grpcio = "^1.62.1" -grpcio-tools = "^1.62.1" -jinja2 = "^3.1.3" -protoc-gen-openapiv2 = "^0.0.1" -pytest = "*" - -[package.source] -type = "git" -url = "https://github.com/vegaprotocol/vega-python-protos" -reference = "develop" -resolved_reference = "19ccb1c97e5f1d7f2676e89fbb7a814d6172f311" - -[[package]] -name = "vegapy" -version = "0.1.0" -description = "" -optional = false -python-versions = "^3.9,<3.12" -files = [] -develop = false - -[package.dependencies] -black = "^24.2.0" -grpcio = "^1.59.3" -grpcio-tools = "^1.59.3" -jinja2 = "^3.1.2" -matplotlib = "^3.8.2" -pandas = "^2.1.4" -protobuf = "^4.25.1" -protoc-gen-openapiv2 = "^0.0.1" -pyqt6 = "^6.6.1" -pytest = "^7.4.3" -pyyaml = "^6.0.1" -requests = "^2.31.0" -toml = "^0.10.2" -vega_python_protos = {git = "https://github.com/vegaprotocol/vega-python-protos", branch = "develop"} - -[package.source] -type = "git" -url = "https://github.com/cdummett/vegapy/" -reference = "develop" -resolved_reference = "048a05e186aa33afa881298031e8fe58a9289559" - [[package]] name = "wcwidth" version = "0.2.13" @@ -4312,4 +4194,4 @@ profile = ["pytest-profiling", "snakeviz"] [metadata] lock-version = "2.0" python-versions = "^3.10,<3.12" -content-hash = "c8916c7da7651d11416c6b355547bcd4e0a50d937a1af26707cfbf96c2e3f146" +content-hash = "18cb8c2818348fa8645578012f6a00c9eec0159d120f28e539fc95b417a2a00d" diff --git a/pyproject.toml b/pyproject.toml index 75bc5b1b4..024880d89 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,6 @@ pettingzoo = {version = "*", optional = true} numba = {version = "^0.57.1", optional = true} tianshou = {version = "*", optional = true} protofuzz = { git = "https://github.com/trailofbits/protofuzz", branch="master" } -vega_python_protos = {git = "https://github.com/vegaprotocol/vega-python-protos", branch="develop" } [tool.poetry.group.dev.dependencies] black = "*" @@ -53,7 +52,6 @@ Jinja2 = "*" nbmake = "*" matplotlib = "*" pytest-xdist = "*" -vegapy = {git = "https://github.com/cdummett/vegapy/", branch="develop"} [build-system] diff --git a/requirements-dev.txt b/requirements-dev.txt index 131931bf3..d776c1d0d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -67,16 +67,12 @@ pyflakes==3.2.0 ; python_version >= "3.10" and python_version < "3.12" pygments==2.18.0 ; python_version >= "3.10" and python_version < "3.12" pynacl==1.5.0 ; python_version >= "3.10" and python_version < "3.12" pyparsing==3.1.2 ; python_version >= "3.10" and python_version < "3.12" -pyqt6-qt6==6.7.2 ; python_version >= "3.10" and python_version < "3.12" -pyqt6-sip==13.8.0 ; python_version >= "3.10" and python_version < "3.12" -pyqt6==6.7.1 ; python_version >= "3.10" and python_version < "3.12" pytest-xdist==3.6.1 ; python_version >= "3.10" and python_version < "3.12" pytest==7.4.4 ; python_version >= "3.10" and python_version < "3.12" python-dateutil==2.9.0.post0 ; python_version >= "3.10" and python_version < "3.12" python-dotenv==1.0.1 ; python_version >= "3.10" and python_version < "3.12" pytz==2024.1 ; python_version >= "3.10" and python_version < "3.12" pywin32==306 ; python_version >= "3.10" and python_version < "3.12" and sys_platform == "win32" -pyyaml==6.0.1 ; python_version >= "3.10" and python_version < "3.12" pyzmq==26.0.3 ; python_version >= "3.10" and python_version < "3.12" referencing==0.35.1 ; python_version >= "3.10" and python_version < "3.12" requests-mock==1.12.1 ; python_version >= "3.10" and python_version < "3.12" @@ -94,8 +90,6 @@ traitlets==5.14.3 ; python_version >= "3.10" and python_version < "3.12" typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "3.12" tzdata==2024.1 ; python_version >= "3.10" and python_version < "3.12" urllib3==2.2.1 ; python_version >= "3.10" and python_version < "3.12" -vega-python-protos @ git+https://github.com/vegaprotocol/vega-python-protos@19ccb1c97e5f1d7f2676e89fbb7a814d6172f311 ; python_version >= "3.10" and python_version < "3.12" -vegapy @ git+https://github.com/cdummett/vegapy/@048a05e186aa33afa881298031e8fe58a9289559 ; python_version >= "3.10" and python_version < "3.12" wcwidth==0.2.13 ; python_version >= "3.10" and python_version < "3.12" websocket-client==1.8.0 ; python_version >= "3.10" and python_version < "3.12" wrapt==1.16.0 ; python_version >= "3.10" and python_version < "3.12" diff --git a/requirements-learning.txt b/requirements-learning.txt index 94381702c..e060c45af 100644 --- a/requirements-learning.txt +++ b/requirements-learning.txt @@ -94,16 +94,12 @@ pyflakes==3.2.0 ; python_version >= "3.10" and python_version < "3.12" pygments==2.18.0 ; python_version >= "3.10" and python_version < "3.12" pynacl==1.5.0 ; python_version >= "3.10" and python_version < "3.12" pyparsing==3.1.2 ; python_version >= "3.10" and python_version < "3.12" -pyqt6-qt6==6.7.2 ; python_version >= "3.10" and python_version < "3.12" -pyqt6-sip==13.8.0 ; python_version >= "3.10" and python_version < "3.12" -pyqt6==6.7.1 ; python_version >= "3.10" and python_version < "3.12" pytest-xdist==3.6.1 ; python_version >= "3.10" and python_version < "3.12" pytest==7.4.4 ; python_version >= "3.10" and python_version < "3.12" python-dateutil==2.9.0.post0 ; python_version >= "3.10" and python_version < "3.12" python-dotenv==1.0.1 ; python_version >= "3.10" and python_version < "3.12" pytz==2024.1 ; python_version >= "3.10" and python_version < "3.12" pywin32==306 ; python_version >= "3.10" and python_version < "3.12" and sys_platform == "win32" -pyyaml==6.0.1 ; python_version >= "3.10" and python_version < "3.12" pyzmq==26.0.3 ; python_version >= "3.10" and python_version < "3.12" referencing==0.35.1 ; python_version >= "3.10" and python_version < "3.12" requests-mock==1.12.1 ; python_version >= "3.10" and python_version < "3.12" @@ -130,8 +126,6 @@ triton==2.3.1 ; platform_system == "Linux" and platform_machine == "x86_64" and typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "3.12" tzdata==2024.1 ; python_version >= "3.10" and python_version < "3.12" urllib3==2.2.1 ; python_version >= "3.10" and python_version < "3.12" -vega-python-protos @ git+https://github.com/vegaprotocol/vega-python-protos@19ccb1c97e5f1d7f2676e89fbb7a814d6172f311 ; python_version >= "3.10" and python_version < "3.12" -vegapy @ git+https://github.com/cdummett/vegapy/@048a05e186aa33afa881298031e8fe58a9289559 ; python_version >= "3.10" and python_version < "3.12" wcwidth==0.2.13 ; python_version >= "3.10" and python_version < "3.12" websocket-client==1.8.0 ; python_version >= "3.10" and python_version < "3.12" werkzeug==3.0.3 ; python_version >= "3.10" and python_version < "3.12" diff --git a/requirements.txt b/requirements.txt index 2910ff817..89084fd38 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,34 +1,23 @@ -black==24.4.2 ; python_version >= "3.10" and python_version < "3.12" certifi==2024.6.2 ; python_version >= "3.10" and python_version < "3.12" cffi==1.16.0 ; python_version >= "3.10" and python_version < "3.12" charset-normalizer==3.3.2 ; python_version >= "3.10" and python_version < "3.12" -click==8.1.7 ; python_version >= "3.10" and python_version < "3.12" -colorama==0.4.6 ; python_version >= "3.10" and python_version < "3.12" and (sys_platform == "win32" or platform_system == "Windows") contourpy==1.2.1 ; python_version >= "3.10" and python_version < "3.12" cycler==0.12.1 ; python_version >= "3.10" and python_version < "3.12" deprecated==1.2.14 ; python_version >= "3.10" and python_version < "3.12" docker==7.1.0 ; python_version >= "3.10" and python_version < "3.12" -exceptiongroup==1.2.1 ; python_version >= "3.10" and python_version < "3.11" fonttools==4.53.0 ; python_version >= "3.10" and python_version < "3.12" googleapis-common-protos==1.63.1 ; python_version >= "3.10" and python_version < "3.12" grpcio-tools==1.62.2 ; python_version >= "3.10" and python_version < "3.12" grpcio==1.64.1 ; python_version >= "3.10" and python_version < "3.12" idna==3.7 ; python_version >= "3.10" and python_version < "3.12" inflection==0.5.1 ; python_version >= "3.10" and python_version < "3.12" -iniconfig==2.0.0 ; python_version >= "3.10" and python_version < "3.12" -jinja2==3.1.4 ; python_version >= "3.10" and python_version < "3.12" kiwisolver==1.4.5 ; python_version >= "3.10" and python_version < "3.12" -markupsafe==2.1.5 ; python_version >= "3.10" and python_version < "3.12" matplotlib==3.9.0 ; python_version >= "3.10" and python_version < "3.12" -mypy-extensions==1.0.0 ; python_version >= "3.10" and python_version < "3.12" numpy==1.24.4 ; python_version >= "3.10" and python_version < "3.12" packaging==24.1 ; python_version >= "3.10" and python_version < "3.12" pandas==2.2.2 ; python_version >= "3.10" and python_version < "3.12" -pathspec==0.12.1 ; python_version >= "3.10" and python_version < "3.12" pillow==10.3.0 ; python_version >= "3.10" and python_version < "3.12" -platformdirs==4.2.2 ; python_version >= "3.10" and python_version < "3.12" plotly==5.22.0 ; python_version >= "3.10" and python_version < "3.12" -pluggy==1.5.0 ; python_version >= "3.10" and python_version < "3.12" protobuf==4.25.3 ; python_version >= "3.10" and python_version < "3.12" protoc-gen-openapiv2==0.0.1 ; python_version >= "3.10" and python_version < "3.12" protofuzz @ git+https://github.com/trailofbits/protofuzz@a4fd0936ae501dba0fc89d3af4ead8ef3aaad1d1 ; python_version >= "3.10" and python_version < "3.12" @@ -36,7 +25,6 @@ psutil==5.9.8 ; python_version >= "3.10" and python_version < "3.12" pycparser==2.22 ; python_version >= "3.10" and python_version < "3.12" pynacl==1.5.0 ; python_version >= "3.10" and python_version < "3.12" pyparsing==3.1.2 ; python_version >= "3.10" and python_version < "3.12" -pytest==7.4.4 ; python_version >= "3.10" and python_version < "3.12" python-dateutil==2.9.0.post0 ; python_version >= "3.10" and python_version < "3.12" python-dotenv==1.0.1 ; python_version >= "3.10" and python_version < "3.12" pytz==2024.1 ; python_version >= "3.10" and python_version < "3.12" @@ -47,10 +35,7 @@ setuptools==70.0.0 ; python_version >= "3.10" and python_version < "3.12" six==1.16.0 ; python_version >= "3.10" and python_version < "3.12" tenacity==8.3.0 ; python_version >= "3.10" and python_version < "3.12" toml==0.10.2 ; python_version >= "3.10" and python_version < "3.12" -tomli==2.0.1 ; python_version >= "3.10" and python_version < "3.11" -typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "3.11" tzdata==2024.1 ; python_version >= "3.10" and python_version < "3.12" urllib3==2.2.1 ; python_version >= "3.10" and python_version < "3.12" -vega-python-protos @ git+https://github.com/vegaprotocol/vega-python-protos@19ccb1c97e5f1d7f2676e89fbb7a814d6172f311 ; python_version >= "3.10" and python_version < "3.12" websocket-client==1.8.0 ; python_version >= "3.10" and python_version < "3.12" wrapt==1.16.0 ; python_version >= "3.10" and python_version < "3.12" diff --git a/tests/vega_protos/test_protos.py b/tests/vega_protos/test_protos.py index b62576341..09e8ef70a 100644 --- a/tests/vega_protos/test_protos.py +++ b/tests/vega_protos/test_protos.py @@ -2,10 +2,12 @@ import vega_protos as protos + @pytest.integration.vega_protos def test_data_node_attributes(): protos.data_node.api.v2.trading_data + @pytest.mark.vega_protos def test_vega_attributes(): protos.vega.assets