diff options
| author | Andrius Merkys <merkys@debian.org> | 2022-08-09 02:39:04 -0400 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2022-08-09 10:35:18 +0000 |
| commit | 7d334644846df19e9512ae17aae046d86c533360 (patch) | |
| tree | 7b033bafb9bd06b7932dfb530d7a593ad65707fe | |
| parent | d1b74b628399453997d1518995d33a52ce9924af (diff) | |
1.3.4+ds-1 (patches unapplied)import/1.3.4+ds-1ubuntu/kinetic-proposedubuntu/kinetic-develubuntu/kinetic
Imported using git-ubuntu import.
Notes
Notes:
* New upstream version 1.3.4+ds
* Refresh debian/copyright.
| -rw-r--r-- | LICENSE.txt | 2 | ||||
| -rw-r--r-- | PKG-INFO | 78 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/copyright | 4 | ||||
| -rw-r--r-- | peakutils/__init__.py | 2 | ||||
| -rw-r--r-- | peakutils/baseline.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | tests/perf.py | 5 |
8 files changed, 54 insertions, 48 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index 44111a0..0a56926 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014 Lucas Hermann Negri +Copyright (c) 2014-2022 Lucas Hermann Negri Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -1,53 +1,53 @@ Metadata-Version: 2.1 Name: PeakUtils -Version: 1.3.3 +Version: 1.3.4 Summary: Peak detection utilities for 1D data Home-page: https://bitbucket.org/lucashnegri/peakutils Author: Lucas Hermann Negri Author-email: lucashnegri@gmail.com License: MIT -Description: PeakUtils - ========= - - .. image:: https://zenodo.org/badge/102883046.svg - :target: https://zenodo.org/badge/latestdoi/102883046 - - This package provides utilities related to the detection of peaks on 1D data. - Includes functions to estimate baselines, finding the indexes of peaks in the data - and performing Gaussian fitting or centroid computation to further increase the - resolution of the peak detection. - - The documentation is available at http://peakutils.readthedocs.io/en/latest . - - Installation - ------------ - - To install PeakUtils from the source package, run: - - .. code-block:: bash - - python setup.py install - - PeakUtils targets Python 2.7+ and depends on numpy, scipy, and optionally on - matplotlib. - - Contribute - ---------- - - - Source Code: https://bitbucket.org/lucashnegri/peakutils - - Issues: https://bitbucket.org/lucashnegri/peakutils/issues - - Direct contact: Lucas Hermann Negri - lucashnegri <at> gmail.com - - License - ------- - - The project is licensed under the MIT license. - Keywords: peak detection search gaussian centroid baseline maximum -Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable Classifier: License :: OSI Approved :: MIT License Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 3 Classifier: Topic :: Scientific/Engineering Description-Content-Type: text/x-rst +License-File: LICENSE.txt + +PeakUtils +========= + +.. image:: https://zenodo.org/badge/102883046.svg + :target: https://zenodo.org/badge/latestdoi/102883046 + +This package provides utilities related to the detection of peaks on 1D data. +Includes functions to estimate baselines, finding the indexes of peaks in the data +and performing Gaussian fitting or centroid computation to further increase the +resolution of the peak detection. + +The documentation is available at http://peakutils.readthedocs.io/en/latest . + +Installation +------------ + +To install PeakUtils from the source package, run: + +.. code-block:: bash + + python setup.py install + +PeakUtils targets Python 2.7+ and depends on numpy, scipy, and optionally on +matplotlib. + +Contribute +---------- + +- Source Code: https://bitbucket.org/lucashnegri/peakutils +- Issues: https://bitbucket.org/lucashnegri/peakutils/issues +- Direct contact: Lucas Hermann Negri - lucashnegri <at> gmail.com + +License +------- + +The project is licensed under the MIT license. diff --git a/debian/changelog b/debian/changelog index 3e57e49..5a70807 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-peakutils (1.3.4+ds-1) unstable; urgency=medium + + * New upstream version 1.3.4+ds + * Refresh debian/copyright. + + -- Andrius Merkys <merkys@debian.org> Tue, 09 Aug 2022 02:39:04 -0400 + python-peakutils (1.3.3+ds-3) unstable; urgency=low [ Debian Janitor ] diff --git a/debian/copyright b/debian/copyright index 9d86cf4..3e15b15 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,11 +6,11 @@ Files-Excluded: PeakUtils.egg-info Files: * -Copyright: 2014, Lucas Hermann Negri <lucashnegri@gmail.com> +Copyright: 2014-2022, Lucas Hermann Negri <lucashnegri@gmail.com> License: Expat Files: debian/* -Copyright: 2020, Andrius Merkys <merkys@debian.org> +Copyright: 2020-2022, Andrius Merkys <merkys@debian.org> License: Expat License: Expat diff --git a/peakutils/__init__.py b/peakutils/__init__.py index 9694445..85d366e 100644 --- a/peakutils/__init__.py +++ b/peakutils/__init__.py @@ -2,4 +2,4 @@ from .baseline import * from .peak import * from .prepare import * -__version__ = '1.3.3' +__version__ = '1.3.4' diff --git a/peakutils/baseline.py b/peakutils/baseline.py index 01587ce..2fb2525 100644 --- a/peakutils/baseline.py +++ b/peakutils/baseline.py @@ -48,7 +48,7 @@ def baseline(y, deg=None, max_it=None, tol=None): base = y.copy() vander = np.vander(x, order) - vander_pinv = LA.pinv2(vander) + vander_pinv = LA.pinv(vander) for _ in range(max_it): coeffs_new = np.dot(vander_pinv, y) @@ -5,7 +5,7 @@ with open('README.rst') as readme: setup( name='PeakUtils', - version='1.3.3', + version='1.3.4', description='Peak detection utilities for 1D data', long_description=long_description, long_description_content_type="text/x-rst", diff --git a/tests/perf.py b/tests/perf.py index cd28ec4..b7f8b39 100644 --- a/tests/perf.py +++ b/tests/perf.py @@ -16,14 +16,13 @@ def benchit(): ("Small - High noise", make_data(200, 3.), 100), ("Big - Low noise", make_data(20000, 1), 5), ("Big - High noise", make_data(20000, 2.), 5), - ("Plateaus", (0, np.insert(np.ones(20000-3), - [1000, 10000, -1000], 3)), 5)] + ("Plateaus", (0, np.insert(np.ones(20000-3), [1000, 10000, -1000], 3)), 5)] for name, data, rep in tests: begin = timer() for _ in range(rep): y = data[1] - peakutils.baseline(data[1]) - if name is "Plateaus": y = data[1] + if name == "Plateaus": y = data[1] i = peakutils.indexes(y, thres=0.4, min_dist=y.size // 5) end = timer() |