Skip to content

Commit 4fa69ee

Browse files
author
dylanwal
committed
update to numpy 2.0 syntax
1 parent 52e193b commit 4fa69ee

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

chemdraw/drawers/layout.py

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,23 @@ def get_scaling(self, molecule: Molecule, title: str):
6161
else:
6262
self.range_y = np.array([-5, 5], dtype="float64")
6363

64-
if self.fixed_domain and self.range_y.ptp() != self.range_x.ptp():
65-
if self.range_x.ptp() > self.range_y.ptp():
66-
self.range_y = self.range_x / self.domain_ratio
67-
else:
68-
self.range_x = self.range_y / self.domain_ratio
69-
70-
self.scaling = np.max((self.range_x.ptp(), self.range_y.ptp())) / 10
64+
if np.__version__[0] < '2':
65+
if self.fixed_domain and self.range_y.ptp() != self.range_x.ptp():
66+
if self.range_x.ptp() > self.range_y.ptp():
67+
self.range_y = self.range_x / self.domain_ratio
68+
else:
69+
self.range_x = self.range_y / self.domain_ratio
70+
71+
self.scaling = np.max((self.range_x.ptp(), self.range_y.ptp())) / 10
72+
else:
73+
# update to numpy 2 syntax
74+
if self.fixed_domain and np.ptp(self.range_y) != np.ptp(self.range_x):
75+
if np.ptp(self.range_x) > np.ptp(self.range_y):
76+
self.range_y = self.range_x / self.domain_ratio
77+
else:
78+
self.range_x = self.range_y / self.domain_ratio
79+
80+
self.scaling = np.max((np.ptp(self.range_x), np.ptp(self.range_y))) / 10
7181

7282
def apply_layout(self, fig: go.Figure, legend: bool = False) -> go.Figure:
7383
kwargs = {

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = chemdraw
3-
version = 0.0.4
3+
version = 0.0.6
44
description = Drawing molecules
55
long_description = file: README.md
66
long_description_content_type = text/markdown

0 commit comments

Comments
 (0)