Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MAINT] Remove conda from CI Linux Workflows #794

Merged
merged 17 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 0 additions & 53 deletions .github/workflows/unit_tests.yml

This file was deleted.

68 changes: 68 additions & 0 deletions .github/workflows/unix_unit_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: Unit tests

on:
push:
branches: ['**']
pull_request:
branches: ['**']

jobs:
build:

runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest,macos-latest]
python-version: [3.8, 3.9, '3.10']

steps:
- uses: actions/checkout@v4

- name: Install Ubuntu System dependencies
if: matrix.os == 'ubuntu-latest'
shell: bash -el {0}
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get install libopenmpi-dev openmpi-bin

- name: Activate conda environment for macOS
if: matrix.os == 'macos-latest'
uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: test
python-version: ${{ matrix.python-version }}
fetch-depth: 2

- name: Activate Python environment for Ubuntu
if: matrix.os == 'ubuntu-latest'
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Install Python dependencies
shell: bash -el {0}
run: |
if [ ${{ matrix.os }} == 'macos-latest' ]; then
python -m pip install --upgrade pip
conda install --yes -c conda-forge mpi4py openmpi
elif [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then
python -m pip install --upgrade pip
python -m pip install mpi4py
fi
- name: Install HNN-core
shell: bash -el {0}
run: |
pip install --verbose '.[opt, parallel, test, gui]'
- name: Lint with flake8
shell: bash -el {0}
run: |
flake8 --count hnn_core
- name: Test with pytest
shell: bash -el {0}
run: |
python -m pytest ./hnn_core/tests/ --cov=hnn_core --cov-report=xml
- name: Upload coverage to Codecov
shell: bash -el {0}
run: |
bash <(curl -s https://codecov.io/bash) -f ./coverage.xml
2 changes: 1 addition & 1 deletion .github/workflows/windows_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
os: [windows-latest]
python-version: [3.8, 3.9]
python-version: [3.8, 3.9, '3.10']

steps:
- uses: actions/checkout@v4
Expand Down
3 changes: 2 additions & 1 deletion hnn_core/gui/gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -1274,7 +1274,8 @@ def load_drive_and_connectivity(params, log_out, drives_out,
"""Add drive and connectivity ipywidgets from params."""
with log_out:
# Add connectivity
add_connectivity_tab(params, connectivity_out, connectivity_textfields)
add_connectivity_tab(params, connectivity_out,
connectivity_textfields)
# Add drives
add_drive_tab(params, log_out, drives_out, drive_widgets, drive_boxes,
tstop, layout)
Expand Down
Loading