Skip to content

Commit

Permalink
Merge branch 'main' into add_testpypi_to_test
Browse files Browse the repository at this point in the history
  • Loading branch information
DomFijan authored Feb 19, 2025
2 parents 8fa82ad + f3cdb67 commit 86d07bd
Show file tree
Hide file tree
Showing 21 changed files with 84 additions and 14 deletions.
13 changes: 13 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,16 @@ repos:
- python
- pyi
- jupyter
- repo: https://github.com/glotzerlab/fix-license-header
rev: v0.4.1
hooks:
- id: fix-license-header
name: Fix License Headers (Python)
exclude: ^docs/|^tests/
types_or: [python]
args:
- --license-file=LICENSE
- --start=0
- --num=1
- --add=This file is from the dupin project, released under the BSD 3-Clause License.
- --keep-before=#!
3 changes: 3 additions & 0 deletions conftest.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Provide fixture and other testing helpers."""

import freud
Expand Down
28 changes: 14 additions & 14 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ channels:
- conda-forge
- defaults
dependencies:
- python
- pip
- bottleneck
- freud
- kneed
- numpy
- ruptures
- scikit-learn
- pandas
- sphinx
- furo
- nbsphinx
- jupyter_sphinx
- pandoc
- python==3.13.2
- pip==25.0.1
- bottleneck==1.4.2
- freud==3.2.0
- kneed==0.8.5
- numpy==2.2.3
- ruptures==1.0.6
- scikit-learn==1.6.1
- pandas==2.2.3
- sphinx==8.1.3
- furo==2024.8.6
- nbsphinx==0.9.6
- jupyter_sphinx==0.5.3
- pandoc==3.6.3
3 changes: 3 additions & 0 deletions dupin/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Top-level package for event-detection."""

__author__ = """Brandon Butler"""
Expand Down
3 changes: 3 additions & 0 deletions dupin/data/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Classes and functions for generating and recording system descriptors.
Data Model
Expand Down
3 changes: 3 additions & 0 deletions dupin/data/aggregate.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Helper module for generating/storing features across an entire trajectory.
This class provides the `SignalAggregator` class which takes a pipeline and
Expand Down
3 changes: 3 additions & 0 deletions dupin/data/base.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Base classes for the data module."""

import typing
Expand Down
3 changes: 3 additions & 0 deletions dupin/data/freud.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Interface from `freud` to dupin.
freud is a Python package for analyzing molecular trajectory data.
Expand Down
3 changes: 3 additions & 0 deletions dupin/data/logging.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Functions and classes for allowing logging extra data from pipelines.
Logging serves as the only directly supported means of introspecting into the
Expand Down
3 changes: 3 additions & 0 deletions dupin/data/map.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""`dupin.data.base.DataMap` subclasses to transform distributional data.
Mapping in dupin is the idea of taking one distribution and transforming it
Expand Down
3 changes: 3 additions & 0 deletions dupin/data/reduce.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Classes for transforming array quantities into scalar features.
Reduction in ``dupin`` takes an array and _reduces_ it to a set number of scalar
Expand Down
3 changes: 3 additions & 0 deletions dupin/data/spatial.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Spatial averaging DataMap classes."""

import numpy as np
Expand Down
3 changes: 3 additions & 0 deletions dupin/detect/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Methods for event detection in molecular simulations.
dupin provides classes and functions to help in the event detection process but
Expand Down
3 changes: 3 additions & 0 deletions dupin/detect/costs.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Implements cost functions for use in event detection."""

from abc import ABC, abstractmethod
Expand Down
3 changes: 3 additions & 0 deletions dupin/detect/detect.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Implements offline methods for detecting events in molecular simulations."""

import logging
Expand Down
3 changes: 3 additions & 0 deletions dupin/errors.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Base error classes or associated classes."""


Expand Down
3 changes: 3 additions & 0 deletions dupin/postprocessing.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""General functions for analyzing change points once detected.
This module is designed to primarly work with logger data and the original
Expand Down
3 changes: 3 additions & 0 deletions dupin/preprocessing/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Perform various kinds of preprocessing on generated signals.
This module provides resources for the transformation step of the event
Expand Down
3 changes: 3 additions & 0 deletions dupin/preprocessing/filter.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Feature selection schemes.
This provides feature selection schemes distinct from packages like
Expand Down
3 changes: 3 additions & 0 deletions dupin/preprocessing/signal.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Functions for smoothing a signal.
`scipy.signal` provides many additional methods for signal processing that can
Expand Down
3 changes: 3 additions & 0 deletions dupin/preprocessing/supervised.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 The Regents of the University of Michigan.
# This file is from the dupin project, released under the BSD 3-Clause License.

"""Classes for use in utilizing supervised learning for event detection."""

from collections.abc import Sequence
Expand Down

0 comments on commit 86d07bd

Please sign in to comment.