Skip to content

Commit 583df9d

Browse files
committed
Merge branch 'develop' into 'main'
Develop See merge request weave/pydv!208
2 parents 489aa65 + c161d3a commit 583df9d

File tree

6 files changed

+13
-21
lines changed

6 files changed

+13
-21
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
env:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
2020
with:
21-
tag_name: pydv-3.9.0
22-
release_name: PyDV 3.9.0
21+
tag_name: pydv-3.9.1
22+
release_name: PyDV 3.9.1
2323
draft: false
2424
prerelease: false

docs/release_notes.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
Release Notes
44
=============
5+
3.9.1
6+
------
7+
* Remove `distutils`
8+
59
3.9.0
610
------
711
* Support for sina hdf5 files

pydv/pydvpy.py

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@
6868
import subprocess
6969
import h5py
7070

71-
from distutils.version import LooseVersion
72-
7371
import numpy as np
7472
import scipy
7573
import scipy.special
@@ -2923,16 +2921,11 @@ def fft(c, n=None, axis=-1, norm=None):
29232921
:type norm: None, "ortho", optional
29242922
:return: Curve tuple -- Two curves with the real and imaginary parts.
29252923
"""
2926-
numpy1_10 = LooseVersion(np.__version__) >= LooseVersion("1.10.0")
29272924
cnorm = c.normalize()
29282925
clen = len(c.x)
29292926

2930-
if numpy1_10:
2931-
complex_array = np.fft.fft(cnorm.y, n, axis, norm)
2932-
complex_array = np.fft.fftshift(complex_array)
2933-
else:
2934-
complex_array = np.fft.fft(cnorm.y, n, axis)
2935-
complex_array = np.fft.fftshift(complex_array)
2927+
complex_array = np.fft.fft(cnorm.y, n, axis, norm)
2928+
complex_array = np.fft.fftshift(complex_array)
29362929

29372930
val = 1.0 / (float(max(cnorm.x) - min(cnorm.x)) / 2.0)
29382931
x = np.fft.fftfreq(clen, d=val)
@@ -3983,12 +3976,7 @@ def __ifft(cr, ci):
39833976
"""
39843977
carray = cr.y + 1j * ci.y
39853978

3986-
numpy1_10 = LooseVersion(np.__version__) >= LooseVersion("1.10.0")
3987-
3988-
if numpy1_10:
3989-
complex_array = np.fft.ifft(carray)
3990-
else:
3991-
complex_array = np.fft.ifft(carray)
3979+
complex_array = np.fft.ifft(carray)
39923980

39933981
# nc1.x = np.array(cr.x)
39943982
nc1y = complex_array.real

pydv/scripts/date.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
01.15.2026
1+
02.12.2026

pydv/scripts/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.9.0
1+
3.9.1

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tool]
22
[tool.poetry]
33
name = "PyDV"
4-
version = "3.9.0"
4+
version = "3.9.1"
55
description = "PyDV: Python Data Visualizer"
66
license = "BSD"
77
classifiers = [
@@ -64,7 +64,7 @@ build-backend = "poetry.core.masonry.api"
6464
line-length = 79
6565

6666
[tool.bumpver]
67-
current_version = "3.9.0"
67+
current_version = "3.9.1"
6868
version_pattern = "MAJOR.MINOR.PATCH"
6969
commit_message = "bump version {old_version} -> {new_version}"
7070
commit = true

0 commit comments

Comments
 (0)