Skip to content

Commit

Permalink
Merge pull request #79 from the-virtual-brain/EBR-40
Browse files Browse the repository at this point in the history
WIP: EBR-40 rebuild tvb-gdist with latest versions
  • Loading branch information
liadomide authored Apr 4, 2024
2 parents 3cef6b2 + db8481c commit c44d69d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@ env:
COVERAGE: 1

jobs:
run_tests_py_3_10:
run_tests:
name: Run tests on ${{ matrix.os }} with python ${{ matrix.python-version }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-20.04, windows-2019, macOS-11 ]
os: [ ubuntu-latest, windows-latest, macOS-13 ]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pytest pytest-cov
pip install setuptools pytest pytest-cov
- name: Install project
run: |
Expand All @@ -36,7 +36,7 @@ jobs:
pytest --junitxml=results.xml --cov
- name: Run Coverage Generation
if: matrix.os == 'ubuntu-20.04'
if: ${{ startsWith(matrix.os, 'ubuntu') }}
run: |
sudo chmod +x cppci.sh
./cppci.sh
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, windows-2019, macOS-11]
os: [ubuntu-latest, windows-latest, macOS-13]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# Used to host cibuildwheel
- uses: actions/setup-python@v3
- uses: actions/setup-python@v5

- name: Install cibuildwheel
run: python -m pip install cibuildwheel==2.11.3
run: python -m pip install setuptools cibuildwheel==2.11.3

- name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse
Expand All @@ -36,7 +36,7 @@ jobs:
name: Build source distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build sdist
run: pipx run build --sdist
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def finalize_options(self):

setuptools.setup(
name="tvb-" + GEODESIC_NAME,
version="2.2",
version="2.2.1",
ext_modules=GEODESIC_MODULE,
include_dirs=INCLUDE_DIRS,
cmdclass={"build_ext": new_build_ext},
Expand Down

0 comments on commit c44d69d

Please sign in to comment.