Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/flake8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ permissions:
jobs:
Run:
name: "Flake8"
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-22.04"

steps:
- name: Checkout 🛎️
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

strategy:
matrix:
os: ['ubuntu-20.04', 'windows-2019']
os: ['ubuntu-22.04', 'windows-2019']
fail-fast: false

steps:
Expand All @@ -43,7 +43,7 @@ jobs:
python-version: "3.8"

- name: Install dependencies (Linux) 🔧
if: ${{ matrix.os == 'ubuntu-20.04' && steps.changes.outputs.code == 'true' }}
if: ${{ matrix.os == 'ubuntu-22.04' && steps.changes.outputs.code == 'true' }}
run: |
python -VV
python -m site
Expand All @@ -54,7 +54,7 @@ jobs:
sudo apt install libhdf5-dev netcdf-bin libnetcdf-dev

- name: Install dependencies (Windows) 🔧
if: ${{ matrix.os != 'ubuntu-20.04' && steps.changes.outputs.code == 'true' }}
if: ${{ matrix.os != 'ubuntu-22.04' && steps.changes.outputs.code == 'true' }}
run: |
python -VV
python -m site
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/python_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,4 @@ jobs:
with:
name: "coverage-${{ matrix.config.python-version }}"
path: .coverage
include-hidden-files: true
11 changes: 7 additions & 4 deletions .github/workflows/python_ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ permissions:

jobs:
tests:
name: "ubuntu-20.04 / Python ${{ matrix.config.python-version }}"
runs-on: "ubuntu-20.04"
name: "ubuntu-22.04 / Python ${{ matrix.config.python-version }}"
runs-on: "ubuntu-22.04"
continue-on-error: ${{ matrix.config.experimental }}
env:
USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13'
Expand Down Expand Up @@ -80,11 +80,12 @@ jobs:
with:
name: "coverage-${{ matrix.config.python-version }}"
path: .coverage
include-hidden-files: true


Coverage:
needs: tests
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-22.04"
steps:
- name: Checkout 🛎️
uses: "actions/checkout@v4"
Expand Down Expand Up @@ -122,6 +123,7 @@ jobs:
with:
name: "combined-coverage"
path: .coverage
include-hidden-files: true

- name: "Upload Combined Coverage to Coveralls"
if: ${{ steps.show.outcome != 'failure' }}
Expand All @@ -133,7 +135,7 @@ jobs:
Deploy:
needs: tests

runs-on: "ubuntu-20.04"
runs-on: "ubuntu-22.04"
steps:
- name: Checkout 🛎️
uses: "actions/checkout@v4"
Expand Down Expand Up @@ -207,6 +209,7 @@ jobs:
$CONDA/bin/conda config --set always_yes yes --set changeps1 no
$CONDA/bin/conda update -n base conda
$CONDA/bin/conda info -a
$CONDA/bin/conda install conda-forge::py-lief=0.14.1
$CONDA/bin/conda config --add channels bioconda
$CONDA/bin/conda config --add channels conda-forge
$CONDA/bin/conda config --add channels domdfcoding
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/python_ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ permissions:

jobs:
tests:
name: "macos-13 / Python ${{ matrix.config.python-version }}"
runs-on: "macos-13"
name: "macos-${{ matrix.config.os-ver }} / Python ${{ matrix.config.python-version }}"
runs-on: "macos-${{ matrix.config.os-ver }}"
continue-on-error: ${{ matrix.config.experimental }}
env:
USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13'
Expand All @@ -28,13 +28,13 @@ jobs:
fail-fast: False
matrix:
config:
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
- {python-version: "3.11", testenvs: "py311,build", experimental: False}
- {python-version: "3.12", testenvs: "py312,build", experimental: False}
- {python-version: "3.13", testenvs: "py313,build", experimental: False}
- {python-version: "3.7", os-ver: "13", testenvs: "py37,build", experimental: False}
- {python-version: "3.8", os-ver: "14", testenvs: "py38,build", experimental: False}
- {python-version: "3.9", os-ver: "14", testenvs: "py39,build", experimental: False}
- {python-version: "3.10", os-ver: "14", testenvs: "py310,build", experimental: False}
- {python-version: "3.11", os-ver: "14", testenvs: "py311,build", experimental: False}
- {python-version: "3.12", os-ver: "14", testenvs: "py312,build", experimental: False}
- {python-version: "3.13", os-ver: "14", testenvs: "py313,build", experimental: False}

steps:
- name: Checkout 🛎️
Expand Down Expand Up @@ -76,3 +76,4 @@ jobs:
with:
name: "coverage-${{ matrix.config.python-version }}"
path: .coverage
include-hidden-files: true
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ci:

repos:
- repo: https://github.com/repo-helper/pyproject-parser
rev: v0.11.1
rev: v0.13.0
hooks:
- id: reformat-pyproject

Expand Down Expand Up @@ -81,7 +81,7 @@ repos:
- id: snippet-fmt

- repo: https://github.com/python-formate/formate
rev: v0.7.0
rev: v0.8.0
hooks:
- id: formate
exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ python:
- requirements: requirements.txt
- requirements: doc-source/requirements.txt
build:
os: ubuntu-20.04
os: ubuntu-22.04
tools:
python: '3.9'
jobs:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ PyMassSpec-Plot
:target: https://github.com/PyMassSpec/PyMassSpec-Plot/commit/master
:alt: GitHub last commit

.. |maintained| image:: https://img.shields.io/maintenance/yes/2024
.. |maintained| image:: https://img.shields.io/maintenance/yes/2025
:alt: Maintenance

.. |pypi-downloads| image:: https://img.shields.io/pypi/dm/PyMassSpec-Plot
Expand Down
2 changes: 1 addition & 1 deletion doc-source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ PyMassSpec-Plot
:last-commit:
:alt: GitHub last commit

.. |maintained| maintained-shield:: 2024
.. |maintained| maintained-shield:: 2025
:alt: Maintenance

.. |pypi-downloads| pypi-shield::
Expand Down
Loading