From 801060c015088d84a5482825cc8af1608cacbc8d Mon Sep 17 00:00:00 2001 From: Stefan Appelhoff Date: Wed, 4 Oct 2023 16:07:44 +0200 Subject: [PATCH] misc maint --- .github/workflows/python_build.yml | 2 +- .github/workflows/python_publish.yml | 2 +- .github/workflows/python_tests.yml | 12 ++++++------ .pre-commit-config.yaml | 4 ++-- MANIFEST.in | 1 + pybv/tests/test_bv_writer.py | 2 +- requirements-dev.txt | 2 +- setup.cfg | 2 ++ 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/python_build.yml b/.github/workflows/python_build.yml index 4ae9517..b058929 100644 --- a/.github/workflows/python_build.yml +++ b/.github/workflows/python_build.yml @@ -22,7 +22,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - python-version: ["3.9", "3.10", "3.11"] + python-version: ["3.10", "3.11", "3.12"] steps: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 diff --git a/.github/workflows/python_publish.yml b/.github/workflows/python_publish.yml index 3dc944d..bc5d392 100644 --- a/.github/workflows/python_publish.yml +++ b/.github/workflows/python_publish.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml index b93da48..4ddf785 100644 --- a/.github/workflows/python_tests.yml +++ b/.github/workflows/python_tests.yml @@ -21,8 +21,8 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-20.04, ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.9", "3.10", "3.11"] + platform: [ubuntu-22.04, ubuntu-latest, macos-latest, windows-latest] + python-version: ["3.10", "3.11", "3.12"] env: TZ: Europe/Berlin @@ -45,7 +45,7 @@ jobs: python -m pip install -e . - name: install MNE-Python main - if: "matrix.platform == 'ubuntu-20.04'" + if: "matrix.platform == 'ubuntu-22.04'" run: | pip install -U git+https://github.com/mne-tools/mne-python @@ -58,7 +58,7 @@ jobs: mne sys_info - name: Check formatting - if: ${{ matrix.platform == 'ubuntu-20.04' && matrix.python-version == '3.10' }} + if: ${{ matrix.platform == 'ubuntu-22.04' && matrix.python-version == '3.11' }} run: | make pep pre-commit run --all-files || ( git status --short ; git diff ; exit 1 ) @@ -72,14 +72,14 @@ jobs: make build-doc - name: Upload artifacts - if: ${{ matrix.platform == 'ubuntu-20.04' && matrix.python-version == '3.10' }} + if: ${{ matrix.platform == 'ubuntu-22.04' && matrix.python-version == '3.11' }} uses: actions/upload-artifact@v3 with: name: docs-artifact path: docs/_build/html - name: Upload coverage report - if: ${{ matrix.platform == 'ubuntu-20.04' && matrix.python-version == '3.10' }} + if: ${{ matrix.platform == 'ubuntu-22.04' && matrix.python-version == '3.11' }} uses: codecov/codecov-action@v3 with: files: ./coverage.xml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d81ce2e..1d06339 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,11 +17,11 @@ repos: hooks: - id: isort - repo: https://github.com/psf/black - rev: "23.1.0" + rev: "23.9.1" hooks: - id: black - repo: https://github.com/pycqa/flake8 - rev: "6.0.0" + rev: "6.1.0" hooks: - id: flake8 additional_dependencies: [flake8-docstrings] diff --git a/MANIFEST.in b/MANIFEST.in index 7969ba3..e9d5940 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -16,6 +16,7 @@ recursive-exclude docs/generated * recursive-exclude .github * recursive-exclude specification * +exclude .readthedocs.yaml exclude .git-blame-ignore-revs exclude .pre-commit-config.yaml exclude .gitignore diff --git a/pybv/tests/test_bv_writer.py b/pybv/tests/test_bv_writer.py index 4894e66..2e8e9a6 100644 --- a/pybv/tests/test_bv_writer.py +++ b/pybv/tests/test_bv_writer.py @@ -414,7 +414,7 @@ def test_bad_meas_date(tmpdir, meas_date, match): ) def test_comma_in_ch_name(tmpdir, ch_names_tricky): """Test that writing channel names with special characters works.""" - mne = pytest.importorskip("mne", minversion="0.22") + mne = pytest.importorskip("mne", minversion="1.0") # write and read data to BV format write_brainvision( data=data, diff --git a/requirements-dev.txt b/requirements-dev.txt index edae4b0..023382d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ numpy>=1.18.1 -mne>=0.20 +mne>=1.0 check-manifest pytest pytest-cov diff --git a/setup.cfg b/setup.cfg index f8e47be..03ad286 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,6 +26,8 @@ classifiers = Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 project_urls = Documentation = https://pybv.readthedocs.io Bug Reports = https://github.com/bids-standard/pybv/issues