From 7236553d6fd34cc81b9d8857a844d177cdae701c Mon Sep 17 00:00:00 2001 From: giumas Date: Sun, 28 Jul 2024 17:50:32 +0200 Subject: [PATCH] removed double Python setup --- .github/workflows/ssm_on_linux.yml | 8 +------- .github/workflows/ssm_on_windows.yml | 8 ++------ setup.py | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ssm_on_linux.yml b/.github/workflows/ssm_on_linux.yml index 9b27a425..57e6da9c 100644 --- a/.github/workflows/ssm_on_linux.yml +++ b/.github/workflows/ssm_on_linux.yml @@ -10,10 +10,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.11 - uses: actions/setup-python@v4 - with: - python-version: 3.11 - name: setup-conda uses: s-weigand/setup-conda@v1.2.2 with: @@ -22,9 +18,7 @@ jobs: - name: Install dependencies run: | conda config --add channels conda-forge - conda remove python - conda install python -c defaults - conda install appdirs cartopy gdal matplotlib-base numpy psutil pyproj qt-material + conda install python=3.11 appdirs cartopy gdal matplotlib-base numpy>=1.10,<2.0 psutil pyproj qt-material conda install gsw netCDF4 pillow pyserial scipy pip install PySide6 sudo apt-get install -y libegl1 diff --git a/.github/workflows/ssm_on_windows.yml b/.github/workflows/ssm_on_windows.yml index 7f45d1b3..6b912ef4 100644 --- a/.github/workflows/ssm_on_windows.yml +++ b/.github/workflows/ssm_on_windows.yml @@ -10,19 +10,15 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.11 - uses: actions/setup-python@v4 - with: - python-version: 3.11 - name: setup-conda - uses: s-weigand/setup-conda@v1.2.1 + uses: s-weigand/setup-conda@v1.2.2 with: update-conda: true python-version: 3.11 - name: Install dependencies run: | conda config --add channels conda-forge - conda install appdirs cartopy gdal matplotlib-base numpy psutil pyproj qt-material + conda install python=3.11 appdirs cartopy gdal matplotlib-base numpy>=1.10,<2.0 psutil pyproj qt-material conda install gsw netCDF4 pillow pyserial scipy pip install PySide6 pip install hyo2.abc2 diff --git a/setup.py b/setup.py index 04332e04..21162242 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ def find_version(*file_paths): "hyo2.abc2>=2.3.5", "matplotlib", "netCDF4", - "numpy", + "numpy<2.0.0", "pillow", "pyserial", "requests",