Skip to content

Commit

Permalink
removed double Python setup
Browse files Browse the repository at this point in the history
  • Loading branch information
giumas committed Jul 28, 2024
1 parent d79f268 commit a7540ad
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 14 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/ssm_on_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
Expand All @@ -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.* psutil pyproj qt-material
conda install gsw netCDF4 pillow pyserial scipy
pip install PySide6
sudo apt-get install -y libegl1
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/ssm_on_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected].1
uses: s-weigand/[email protected].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.* psutil pyproj qt-material
conda install gsw netCDF4 pillow pyserial scipy
pip install PySide6
pip install hyo2.abc2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def find_version(*file_paths):
"hyo2.abc2>=2.3.5",
"matplotlib",
"netCDF4",
"numpy",
"numpy<2.0.0",
"pillow",
"pyserial",
"requests",
Expand Down

0 comments on commit a7540ad

Please sign in to comment.