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
21 changes: 0 additions & 21 deletions .bumpversion.cfg

This file was deleted.

2 changes: 2 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[flake8]
select = B,B9,BLK,C,D,DAR,E,F,I,S,W

exclude = rimseval/_version.py

# black configuration
ignore = E203,E501,W503
max-line-length = 88
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flit
pip install flit flit-scm setuptools-scm
- name: Build and publish
env:
FLIT_USERNAME: '__token__'
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,6 @@ lib64
.nox
.pytest_cache
htmlcov

# flit scm version stuff
rimseval/_version.py
6 changes: 3 additions & 3 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-20.04
os: ubuntu-22.04
tools:
python: "3.9"
python: "3.11"

# Build documentation in the docs/ directory with Sphinx
sphinx:
Expand All @@ -26,4 +26,4 @@ formats:
python:
install:
- method: pip
path: .
path: .[doc]
5 changes: 3 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@

sys.path.append("../")

from rimseval._version import __version__ as version # noqa E402

# -- Project information -----------------------------------------------------

project = "RIMSEval"
author = "Reto Trappitsch"
copyright = f"2021, {author}"
version = "2.0.1"
copyright = f"2020-2023, {author}"
release = version


Expand Down
7 changes: 5 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[build-system]
requires = ["flit_core >=2,<4"]
build-backend = "flit_core.buildapi"
requires = ["flit_scm"]
build-backend = "flit_scm:buildapi"

[tool.flit.metadata]
module = "rimseval"
Expand Down Expand Up @@ -48,3 +48,6 @@ test = [
minversion = "6.0"
addopts = "--cov=rimseval -v"
testpaths = "tests"

[tool.setuptools_scm]
write_to = "rimseval/_version.py"
7 changes: 3 additions & 4 deletions rimseval/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from . import guis
from . import interfacer
from . import utilities
from ._version import __version__
from .multi_proc import MultiFileProcessor
from .processor import CRDFileProcessor

Expand All @@ -22,11 +23,9 @@
"interfacer",
"MultiFileProcessor",
"utilities",
"__version__",
]

# Package information
__version__ = "2.0.1"

__title__ = "rimseval"
__description__ = (
"Evaluate resonance ionization mass spectrometry measurements, correct, and "
Expand All @@ -38,4 +37,4 @@
__author__ = "Reto Trappitsch"

__license__ = "MIT"
__copyright__ = "Copyright (c) 2022, Reto Trappitsch"
__copyright__ = "Copyright (c) 2020-2023, Reto Trappitsch"