From 341427f259ecc602226c8b7d26b1dee47d3360e5 Mon Sep 17 00:00:00 2001 From: PrimozGodec Date: Fri, 5 May 2023 10:47:10 +0200 Subject: [PATCH 1/2] Update vmImage to macOS-11 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 86fb49d..c17bb2a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,7 +10,7 @@ jobs: - job: 'build_macos_dmg' displayName: Build macOS installer pool: - vmImage: macOS-10.15 + vmImage: macOS-11 strategy: matrix: From 62701408cdee6d86f8e3ae3acfea1eaba267179e Mon Sep 17 00:00:00 2001 From: PrimozGodec Date: Fri, 5 May 2023 11:25:42 +0200 Subject: [PATCH 2/2] Update dependency versions --- ci/appveyor-conda-build.bat | 6 +++--- specs/macos/requirements.txt | 25 ++++++++++++------------- specs/win/PY38.txt | 24 ++++++++++++------------ 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/ci/appveyor-conda-build.bat b/ci/appveyor-conda-build.bat index e4637a9..15d398b 100644 --- a/ci/appveyor-conda-build.bat +++ b/ci/appveyor-conda-build.bat @@ -68,10 +68,10 @@ if "%CONDA_SPEC_FILE%" == "" ( "%CONDA%" create -n env --yes --use-local ^ python=%PYTHON_VERSION% ^ - numpy=1.23.* ^ - scipy=1.9.* ^ + numpy=1.24.* ^ + scipy=1.10.* ^ scikit-learn=1.1.* ^ - pandas=1.4.* ^ + pandas=1.5.* ^ pyqtgraph=0.13.* ^ bottleneck=1.3.* ^ pyqt=5.15.* ^ diff --git a/specs/macos/requirements.txt b/specs/macos/requirements.txt index c8a76ce..c8c02a0 100644 --- a/specs/macos/requirements.txt +++ b/specs/macos/requirements.txt @@ -5,28 +5,27 @@ --only-binary numpy,scipy,scikit-learn,PyQt5,opentsne -numpy~=1.23.0 -scipy~=1.9.0 -scikit-learn~=1.1.2 +numpy~=1.24.0 +scipy~=1.10.0 +scikit-learn~=1.1.0 bottleneck~=1.3.0 joblib==1.2.0 -chardet~=3.0 -keyring==10.3.1 -keyrings.alt==2.2 +chardet~=5.0 +keyring~=23.0 +keyrings.alt~=4.0 AnyQt~=0.2.0 -# PyQt==5.12.3 requires python compiled for MacOS 10.13+ to work on MacOS 11.0 PyQt5~=5.15.4 pyqtwebengine~=5.15.4 -docutils~=0.16.0 -pip~=22.0.0 +docutils~=0.18.0 +pip~=23.0.0 pyqtgraph~=0.13.1 -xlrd~=1.2 +xlrd~=2.0 xlsxwriter serverfiles -opentsne~=0.6.0 +opentsne~=0.7.1 python-louvain>=0.13 -pandas~=1.4.0 +pandas~=1.5.0 xgboost -catboost +catboost~=1.1.1 # catboost 1.2 wheels do not support macos <11 diff --git a/specs/win/PY38.txt b/specs/win/PY38.txt index a6ffade..f4ebca6 100644 --- a/specs/win/PY38.txt +++ b/specs/win/PY38.txt @@ -5,28 +5,28 @@ --only-binary numpy,scipy,scikit-learn,PyQt5,opentsne -numpy~=1.23.0 -scipy~=1.9.0 -scikit-learn~=1.1.2 +numpy~=1.24.0 +scipy~=1.10.0 +scikit-learn~=1.1.0 bottleneck~=1.3.0 -chardet~=3.0 -keyring==10.3.1 -keyrings.alt==2.2 +chardet~=5.0 +keyring~=23.0 +keyrings.alt~=4.0 pywin32-ctypes==0.0.1 pyreadline==2.1 -AnyQt~=0.1.0 +AnyQt~=0.2.0 PyQt5~=5.15.3 pyqtwebengine~=5.15.1 -docutils~=0.16.0 -pip~=22.0.0 +docutils~=0.18.0 +pip~=23.0.0 pyqtgraph~=0.13.1 -xlrd~=1.2 +xlrd~=2.0 xlsxwriter serverfiles -opentsne~=0.6.0 +opentsne~=0.7.1 python-louvain>=0.13 -pandas~=1.4.0 +pandas~=1.5.0 catboost xgboost