diff --git a/poetry.lock b/poetry.lock index e83cf53a..9c5a3827 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. [[package]] name = "alabaster" @@ -1866,43 +1866,47 @@ websockets = ">=12.0,<13.0" [[package]] name = "mxcubecore" -version = "1.159.0" +version = "1.160.0" description = "Core libraries for the MXCuBE application" optional = false -python-versions = "<3.12,>=3.8" -files = [ - {file = "mxcubecore-1.159.0-py3-none-any.whl", hash = "sha256:fc4ed237c3cc49fa5129d9d683dd5b68256a138c6217d8f1f84bade853e6191a"}, - {file = "mxcubecore-1.159.0.tar.gz", hash = "sha256:d17c01c7a8ccafeaffb1efa71fbf689a28eac65fa26a9c5da607cbd1eb3ff3b4"}, -] +python-versions = ">=3.8,<3.12" +files = [] +develop = false [package.dependencies] -colorama = ">=0.4.6,<0.5.0" +colorama = "^0.4.6" f90nml = "1.4.3" -gevent = ">=23.9.1,<24.0.0" -gipc = ">=1.6.0,<2.0.0" -greenlet = ">=3.0.3,<4.0.0" -jsonpickle = ">=2.2.0,<3.0.0" -jsonschema = ">=4.17.1,<5.0.0" -lucid3 = ">=3.0.0,<4.0.0" -lxml = ">=4.9.1,<5.0.0" -matplotlib = ">=3.6.2,<4.0.0" -numpy = ">=1.23.5,<2.0.0" -Pillow = ">=10.4.0,<11.0.0" -psutil = ">=5.9.4,<6.0.0" +gevent = "^23.9.1" +gipc = "^1.6.0" +greenlet = "^3.0.3" +jsonpickle = "^2.2.0" +jsonschema = "^4.17.1" +lucid3 = "^3.0.0" +lxml = "^4.9.1" +matplotlib = "^3.6.2" +numpy = "^1.23.5" +Pillow = "^10.4.0" +psutil = "^5.9.4" py4j = "0.10.9.7" pydantic = ">=2.8.2,<2.9.0" -PyDispatcher = ">=2.0.6,<3.0.0" -python-ldap = ">=3.4.0,<4.0.0" -requests = ">=2.31.0,<3.0.0" -"ruamel.yaml" = ">=0.17.21,<0.18.0" -scipy = ">=1.9.3,<2.0.0" +PyDispatcher = "^2.0.6" +python-ldap = "^3.4.0" +requests = "^2.31.0" +"ruamel.yaml" = "^0.17.21" +scipy = "^1.9.3" suds-py3 = "1.4.5.0" -tomli = {version = ">=2.0.1,<3.0.0", markers = "python_full_version <= \"3.10.0\""} -typing-extensions = ">=4.3.0,<5.0.0" +tomli = {version = "^2.0.1", markers = "python_full_version <= \"3.10.0\""} +typing-extensions = "^4.3.0" [package.extras] tango = ["PyTango (>=9.3.6,<10.0.0)"] +[package.source] +type = "git" +url = "https://github.com/mxcube/esrf-mxcubecore.git" +reference = "esrf-develop" +resolved_reference = "10feab63d5ef565250a53bc54f66c54f19e4ddbd" + [[package]] name = "myst-parser" version = "2.0.0" @@ -3739,4 +3743,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "5844bc1dff0cf39e588044bff5e6637f2de00862790977208927fa23422e5f77" +content-hash = "a6f1009c07dfd5ce43039202738d028e50b72595f29d2b268c03e62170ff8c29" diff --git a/pyproject.toml b/pyproject.toml index c9b49166..88dff769 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ pydantic = ">=2.8.2,<2.9.0" PyDispatcher = "^2.0.6" pytz = "^2022.6" tzlocal = "^4.2" -mxcubecore = ">=1.157.0" +mxcubecore = { git = "https://github.com/mxcube/esrf-mxcubecore.git", branch = "esrf-develop" } mxcube-video-streamer = ">=1.5.0" bcrypt = "^4.0.1" authlib = "^1.3.0" diff --git a/requirements.txt b/requirements.txt index 69ab3533..a8d7631e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -855,9 +855,7 @@ mock==4.0.3 ; python_version >= "3.8" and python_version < "3.12" \ mxcube-video-streamer==1.5.0 ; python_version >= "3.8" and python_version < "3.12" \ --hash=sha256:998a8a909e9b69a55bb3776e56ae7725479ec3b196990bf15f6849c3fb824f37 \ --hash=sha256:fd9d337aad522f60b69182050f9ddfe81d3d2490c2bc8e86ccc669f3e5855718 -mxcubecore==1.159.0 ; python_version >= "3.8" and python_version < "3.12" \ - --hash=sha256:d17c01c7a8ccafeaffb1efa71fbf689a28eac65fa26a9c5da607cbd1eb3ff3b4 \ - --hash=sha256:fc4ed237c3cc49fa5129d9d683dd5b68256a138c6217d8f1f84bade853e6191a +mxcubecore @ git+https://github.com/mxcube/esrf-mxcubecore.git@10feab63d5ef565250a53bc54f66c54f19e4ddbd ; python_version >= "3.8" and python_version < "3.12" numpy==1.24.4 ; python_version >= "3.8" and python_version < "3.12" \ --hash=sha256:04640dab83f7c6c85abf9cd729c5b65f1ebd0ccf9de90b270cd61935eef0197f \ --hash=sha256:1452241c290f3e2a312c137a9999cdbf63f78864d63c79039bda65ee86943f61 \