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
8 changes: 4 additions & 4 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
python-version: ["3.11", "3.12", "3.13", "3.14"]
steps:
- uses: actions/checkout@v6
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -29,14 +29,14 @@ jobs:
flake8 . --count --exit-zero --statistics
- name: Run tests
run: |
pytest --cov=./detl --cov-report xml --cov-report term-missing tests/
pytest -v --cov=./detl --cov-report xml --cov-report term-missing tests/
- name: Upload coverage
uses: codecov/codecov-action@v5
uses: codecov/codecov-action@v6
with:
file: ./coverage.xml
- name: Test Wheel install and import
run: |
python setup.py bdist_wheel
python -m build
cd dist
pip install detl*.whl
python -c "import detl; print(detl.__version__)"
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: 3.9
python-version: "3.13"
- name: Install dependencies
run: |
pip install -e .
pip install flake8 pytest pytest-cov twine wheel
pip install flake8 pytest pytest-cov twine build
- name: Test with pytest
run: |
pytest --cov=./detl --cov-report xml --cov-report term-missing tests/
pytest -v --cov=./detl --cov-report xml --cov-report term-missing tests/
- name: Build package
run: |
python setup.py sdist bdist_wheel
python -m build
- name: Check version number match
run: |
echo "GITHUB_REF: ${GITHUB_REF}"
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
exclude: testfiles/|\.(csv|ipynb)$
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v6.0.0
hooks:
- id: check-merge-conflict
- id: check-toml
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/PyCQA/isort
rev: 5.12.0
rev: 8.0.1
hooks:
- id: isort
name: isort
- repo: https://github.com/psf/black
rev: 23.11.0
rev: 26.3.1
hooks:
- id: black
4 changes: 3 additions & 1 deletion detl/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import importlib.metadata

from . import parsing
from .core import DASwareParser, DASwareVersion, DWData

__version__ = "1.1.3"
__version__ = importlib.metadata.version(__package__ or __name__)

parsers = {
DASwareVersion.V4: parsing.dw4.DASware4Parser,
Expand Down
1 change: 1 addition & 0 deletions detl/core.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Specifies the base types for parsing and representing DASware data."""

import abc
import enum
import pathlib
Expand Down
2 changes: 1 addition & 1 deletion detl/parsing/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,6 @@ def transform_trackdata(
if (not new_data.empty) and (not new_data.isnull().all()):
transformed_data.loc[:, key] = new_data

transformed_data = transformed_data.fillna(method="ffill")
transformed_data = transformed_data.ffill()

return transformed_data
1 change: 0 additions & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ sphinx
sphinx_rtd_theme
numpydoc
nbsphinx
nbsphinx_link
3 changes: 0 additions & 3 deletions docs/source/01_Basic_Use.nblink

This file was deleted.

3 changes: 0 additions & 3 deletions docs/source/02_Closest_Point_Lookup.nblink

This file was deleted.

1 change: 0 additions & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"sphinx_rtd_theme",
"numpydoc",
"nbsphinx",
"nbsphinx_link",
]

# Add any paths that contain templates here, relative to this directory.
Expand Down
4 changes: 2 additions & 2 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ In the following chapters, we introduce the data structures, basic functions and
:maxdepth: 2
:caption: Examples

01_Basic_Use
02_Closest_Point_Lookup
notebooks/01_Basic_Use
notebooks/02_Closest_Point_Lookup


You can find auto-generated API documentation below:
Expand Down
File renamed without changes.
5 changes: 5 additions & 0 deletions notebooks/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Notebooks Moved

Visit [docs/source/notebooks](../docs/source/notebooks).

Or visit https://detl.readthedocs.io.
49 changes: 49 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,54 @@
[build-system]
requires = ["setuptools>=61.0"]
build-backend = "setuptools.build_meta"

[project]
name = "detl"
version = "1.2.0"
description = "Package for parsing and transforming DASware raw data exports."
readme = "README.md"
requires-python = ">=3.11"
license = "AGPL-3.0-or-later"
authors = [
{name = "Michael Osthege", email = "m.osthege@fz-juelich.de"},
{name = "Niklas Tenhaef", email = "n.tenhaef@fz-juelich.de"},
{name = "Valentin Steier", email = "v.steier@fz-juelich.de"},
]
classifiers = [
"Programming Language :: Python",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Intended Audience :: Science/Research",
"Topic :: Scientific/Engineering",
]
dependencies = [
"numpy",
"pandas",
"pytz",
]

[project.urls]
Homepage = "https://github.com/jubiotech/detl"
Documentation = "https://detl.readthedocs.io/en/latest/"
Download = "https://pypi.org/project/detl/"

[tool.setuptools]
package-dir = {"detl" = "detl"}

[tool.setuptools.package-data]
"detl" = ["py.typed"]

[tool.black]
line-length = 100

[tool.isort]
profile = "black"

[tool.mypy]
ignore_missing_imports = true
exclude = [
'test_.*?\.py$',
]
3 changes: 2 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
build
flake8
pandas>=3.0.0
pytest
pytest-cov
twine
wheel
watermark
2 changes: 0 additions & 2 deletions requirements.txt

This file was deleted.

43 changes: 0 additions & 43 deletions setup.py

This file was deleted.

1 change: 1 addition & 0 deletions tests/test_detl.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Contains unit tests for the `detl` package"""

import datetime
import pathlib
import unittest
Expand Down
Loading