Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
5d2758c
sphinx to gh workflow
Mar 15, 2024
bca50f7
sphinx to gh workflow
Mar 15, 2024
5131a2f
sphinx to gh workflow
Mar 15, 2024
104470c
sphinx to gh workflow
Mar 15, 2024
455862b
sphinx to gh workflow
Mar 15, 2024
bfefbe0
sphinx to gh workflow
Mar 15, 2024
9173a19
sphinx to gh workflow
Mar 15, 2024
b78934b
sphinx to gh workflow
Mar 15, 2024
29f05cc
Update dependency numpydoc to v1.7.0
renovate[bot] Apr 1, 2024
085f005
Merge pull request #355 from valentin-petzold/feature/sphinx_docu_to_…
MKoesters Apr 12, 2024
697221a
Update version.txt
fu Apr 12, 2024
744aae7
Merge pull request #356 from pymzml/renovate/numpydoc-1.x
StSchulze Apr 12, 2024
f5552ee
Merge pull request #359 from pymzml/rc/2.5.8
fu Apr 12, 2024
7da5931
Update sphinx.yml
MKoesters Apr 12, 2024
9c021a1
Merge pull request #360 from pymzml/MKoesters-patch-1
MKoesters Apr 12, 2024
bba07f9
Release v2.5.8
Apr 12, 2024
25ed269
Update sphinx.yml
MKoesters Apr 12, 2024
b594e6d
Update version.txt
MKoesters Apr 12, 2024
c616bbf
Merge pull request #361 from pymzml/MKoesters-patch-1
StSchulze Apr 12, 2024
ca25974
test docu
May 2, 2024
022f0fe
test docu
May 2, 2024
4c1de2b
test docu
May 2, 2024
e278f5a
test docu
May 2, 2024
a14f98b
Fix: AttributeError: 'NoneType' object has no attribute 'attrib'
wolfgangcolsman May 7, 2024
a51022b
Fix: AttributeError: 'NoneType' object has no attribute 'attrib'
wolfgangcolsman May 7, 2024
d74fef7
Merge pull request #364 from pymzml/fix/docu_pages
tristan-ranff May 10, 2024
95e1f14
Merge pull request #365 from zontal/bug/NoneType
tristan-ranff May 10, 2024
cb8a479
Update version.txt
tristan-ranff May 10, 2024
428329d
Save GSGW test output file to example_data
Sep 2, 2024
ee429db
Update README.rst
MKoesters Dec 13, 2024
9c5f3aa
Update tox_ci.yml
MKoesters Dec 13, 2024
c5e2648
Update requirements.txt
MKoesters Dec 13, 2024
c5fce21
Merge pull request #369 from pymzml/feature/clean_build_artifacts
MKoesters Dec 13, 2024
a3c71d6
Update README.rst
MKoesters Dec 13, 2024
9b0513d
added instrument / model name look up using obo
Jan 22, 2025
570e61f
added obo file and cache command
Jan 28, 2025
aaa19ea
Merge pull request #373 from tobymathieson/feature/add_instrument_typ…
StSchulze Jan 31, 2025
5c103ab
Update version.txt
fu Jan 31, 2025
4866e9a
Fix what was that?
Jan 31, 2025
87ee267
Fix what was that?
Jan 31, 2025
9bf7dff
Fix what was that?
Jan 31, 2025
637cbb2
Fix what was that?
Jan 31, 2025
9ab9315
Merge pull request #374 from pymzml/fu-patch-1
StSchulze Jan 31, 2025
1ab1290
move to pyproject.toml
Feb 4, 2025
0a161f0
Update dependency python to 3.13
renovate[bot] Mar 11, 2025
b94b292
Add example script and test for accessing chromatograms
rkjulian Mar 5, 2025
fd269e0
Update run.py with chromatogram access methods and update tox.ini for…
rkjulian Mar 5, 2025
bbad0d3
Split chromatogram out from spectra
rkjulian Mar 10, 2025
20ed8e5
Generalize MS_Spectrum class to MsData
rkjulian Mar 18, 2025
f3542b5
Merge pull request #376 from pymzml/feature/move_to_pyproject_toml
fu Mar 28, 2025
40cbdd6
Merge pull request #378 from pymzml/renovate/python-3.x
fu Mar 28, 2025
a66a9c9
Blackin diz
Mar 28, 2025
b0c9cf1
Merge pull request #379 from pymzml/feature/chromatogram_access
StSchulze Mar 28, 2025
102a3e3
Update dependency numpydoc to v1.9.0
renovate[bot] Jun 24, 2025
3d0cbb2
Update actions/checkout action to v5
renovate[bot] Aug 11, 2025
e1fb303
Fix SyntaxWarnings on mzml regex strings (#384)
rileymcdowell Oct 9, 2025
1f132a0
Please SonarQube
MKoesters Oct 10, 2025
e808dc9
remove unnecesarry list cal
MKoesters Oct 10, 2025
8683b2f
Please SonarQube
MKoesters Oct 10, 2025
1a1383a
Merge pull request #381 from pymzml/renovate/actions-checkout-5.x
MKoesters Oct 10, 2025
f01c6f7
Merge pull request #368 from pymzml/renovate/numpydoc-1.x
MKoesters Oct 10, 2025
7128af1
Merge pull request #385 from corteva/syntax_warning_fix_issue_384
MKoesters Oct 11, 2025
b8ef6e9
Update actions/setup-python action to v6
renovate[bot] Nov 11, 2025
f4a4411
Adress #387
MKoesters Nov 15, 2025
dc7ae79
remove debug print function
MKoesters Nov 15, 2025
4d40b36
Update actions/checkout action to v6
renovate[bot] Nov 20, 2025
3e540fa
Convert offset to integer in standardMzml.py
MKoesters Nov 26, 2025
d6de0b1
Merge pull request #388 from pymzml/fix/obo_tests
MKoesters Nov 28, 2025
b1acb0e
Merge pull request #390 from pymzml/feature/regex_index_type_error
MKoesters Nov 28, 2025
1a8b398
Merge pull request #389 from pymzml/renovate/actions-checkout-6.x
MKoesters Nov 28, 2025
06ddc76
Merge pull request #383 from pymzml/renovate/actions-setup-python-6.x
MKoesters Nov 28, 2025
ab26e88
Add workflow_dispatch trigger to Sphinx workflow
MKoesters Dec 5, 2025
846ab83
Remove deprecated install line
MKoesters Dec 5, 2025
8ed5a26
Update sphinx build command to use python module
MKoesters Dec 5, 2025
3be5d21
Update sphinx.yml
MKoesters Dec 5, 2025
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: 0 additions & 2 deletions .github/auto_assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ addReviewers: true
addAssignees: true
reviewers:
- MKoesters

skipKeywords:
- wip
- WIP

numberOfReviewers: 0
7 changes: 3 additions & 4 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
name: Publish to pypi

on:
push:
tags:
Expand All @@ -8,11 +7,11 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: '3.9'
python-version: '3.13'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/sphinx.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# For reference: https://github.com/JamesIves/github-pages-deploy-action
name: Build Sphinx docu.
on:
release:
types: [published]
workflow_dispatch:

permissions:
contents: write
jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v6
- name: Install and Build HTML
run: |
pip install --upgrade pip
pip install ".[test]"
python -m sphinx.cmd.build ./docs/source ./docs/build
- name: Deploy HTML
uses: JamesIves/github-pages-deploy-action@v4
with:
folder: docs/build/ # The folder the action should deploy.
16 changes: 6 additions & 10 deletions .github/workflows/tox_ci.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,27 @@
name: Continious Integration

on:
pull_request

on: pull_request
jobs:
black:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Run black
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: 3.8
- name: install black
run: pip install "black<23"
- name: run black
run: black --check pymzml

build:
runs-on: ubuntu-latest
strategy:
matrix:
python: ['3.8', '3.9', '3.10']
python: ['3.9', '3.10', '3.11']
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Setup Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python }}
- name: install tox
Expand Down
18 changes: 9 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: debug-statements
- repo: https://github.com/ambv/black
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: debug-statements
- repo: https://github.com/ambv/black
rev: 18.9b0
hooks:
- id: black
language_version: python
exclude: ^docs/, ^tests/
- id: black
language_version: python
exclude: ^docs/, ^tests/
7 changes: 2 additions & 5 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

# Required
version: 2

# Set the OS, Python version and other tools you might need
build:
os: ubuntu-22.04
Expand All @@ -13,15 +12,13 @@ build:
# nodejs: "20"
# rust: "1.70"
# golang: "1.20"

# Build documentation in the "docs/" directory with Sphinx
sphinx:
configuration: docs/source/conf.py
# You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
# builder: "dirhtml"
# Fail on all warnings to avoid broken references
# fail_on_warning: true

# Optionally build your docs in additional formats such as PDF and ePub
# formats:
# - pdf
Expand All @@ -31,5 +28,5 @@ sphinx:
# to build your documentation
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
python:
install:
- requirements: docs/requirements.txt
install:
- requirements: docs/requirements.txt
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ General information

Module to parse mzML data in Python based on cElementTree

Copyright 2010-2021 by:
Copyright 2010-2024 by:

| M. Kösters,
| J. Leufken,
Expand Down Expand Up @@ -88,8 +88,8 @@ Download
Get the latest version via github
| https://github.com/pymzml/pymzML

The complete Documentation can be found as pdf
| https://pymzml.readthedocs.io/_/downloads/en/latest/pdf/
The complete Documentation can be found here
| https://pymzml.readthedocs.io/en/latest/


********
Expand Down
4 changes: 0 additions & 4 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ coverage:
precision: 2
round: down
range: "70...100"

status:
project: yes
patch: yes
changes: no

parsers:
gcov:
branch_detection:
Expand All @@ -19,9 +17,7 @@ parsers:
method: False
changes: False
macro: False

comment:
layout: "head, diff"
behaviour: default
require_change: no

36 changes: 17 additions & 19 deletions docs/parse_example_scripts.py
Original file line number Diff line number Diff line change
@@ -1,45 +1,43 @@
#!/usr/bin/env python3
# encoding: utf-8

'''
"""

Originally created for Ursgal ( https://github.com/ursgal/ursgal )


'''
"""

import glob
import os

if __name__ == '__main__':
print('''
if __name__ == "__main__":
print(
"""
Formatting example scripts into rst files for the docs
''')
"""
)
# input()
example_script_path = os.path.join(
os.path.dirname(__file__),
os.pardir,
'example_scripts',
'*.py',
"example_scripts",
"*.py",
)
print(example_script_path)
for example_script in glob.glob(example_script_path):
if os.path.exists(example_script) is False:
continue
basename = os.path.basename(example_script)
print(
'Reading: {0}'.format(example_script)
)
print("Reading: {0}".format(example_script))
file_path = os.path.join(
os.path.dirname(__file__),
'source',
'code_inc',
'{0}',
"source",
"code_inc",
"{0}",
)
with open( file_path.format( basename.replace('.py', '.inc')), 'w') as o:
print('''.. code-block:: python\n''', file=o)
with open( example_script ) as infile:
with open(file_path.format(basename.replace(".py", ".inc")), "w") as o:
print(""".. code-block:: python\n""", file=o)
with open(example_script) as infile:
for line in infile:
print('\t{0}'.format( line.rstrip()), file=o)


print("\t{0}".format(line.rstrip()), file=o)
4 changes: 0 additions & 4 deletions docs/requirements.txt

This file was deleted.

Loading
Loading