From 35b6360a9874b0b0dfe529f26239489e109c85b7 Mon Sep 17 00:00:00 2001 From: mvanhooft Date: Fri, 1 Nov 2024 22:29:13 +0100 Subject: [PATCH 1/4] Relax scipy requirement --- CHANGELOG.md | 5 +++++ setup.cfg | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9a3417..33bb97b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +2024-11-TODO (0.13.3) +------------------ +- Relax scipy requirement + + 2024-10-21 (0.13.2) ------------------ - Bugfix for link noise models depolarise and discrete depolarise in multithread variant diff --git a/setup.cfg b/setup.cfg index bdfcef7..239712f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,7 +17,7 @@ install_requires = netsquid-netbuilder >=0.1.0, <0.2.0 click >=8.0, <9.0 numpy >=1.22, <1.23 - scipy >=1.8, <1.9 + scipy >=1.8, <2 pydantic >=1.8.2, < 3.0 pydynaa >=0.3, <2.0 netsquid >=1.1.2, <2.0 From 3bace13eb56979f7ff88444b33b1dce0e3f9acc9 Mon Sep 17 00:00:00 2001 From: mvanhooft Date: Fri, 1 Nov 2024 22:32:11 +0100 Subject: [PATCH 2/4] Set date of changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33bb97b..0e889bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ CHANGELOG ========= -2024-11-TODO (0.13.3) +2024-11-2 (0.13.3) ------------------ - Relax scipy requirement From 81e8da36ba63426a8d0d142181263c0a20cb0558 Mon Sep 17 00:00:00 2001 From: mvanhooft Date: Mon, 18 Nov 2024 17:31:50 +0100 Subject: [PATCH 3/4] * Relax numpy requirement * Replace np.complex with complex --- setup.cfg | 2 +- squidasm/sim/network/network.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 239712f..9b01618 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,7 +16,7 @@ include_package_data = True install_requires = netsquid-netbuilder >=0.1.0, <0.2.0 click >=8.0, <9.0 - numpy >=1.22, <1.23 + numpy >=1.22, <2.0 scipy >=1.8, <2 pydantic >=1.8.2, < 3.0 pydynaa >=0.3, <2.0 diff --git a/squidasm/sim/network/network.py b/squidasm/sim/network/network.py index 3d401a2..364a0c2 100644 --- a/squidasm/sim/network/network.py +++ b/squidasm/sim/network/network.py @@ -53,7 +53,7 @@ from squidasm.sim.glob import QubitInfo, get_running_backend from squidasm.sim.network.nv_config import NVConfig, build_nv_qdevice -T_SingleQubitState = Tuple[Tuple[np.complex, np.complex]] +T_SingleQubitState = Tuple[Tuple[complex, complex]] EprDeliveredEvent: EventType = EventType( "EPR_DELIVERED", @@ -626,11 +626,11 @@ def _delivery_func(model_params: LinearDepolariseModelParameters, **kwargs): """ epr_state = np.array( [[0.5, 0, 0, 0.5], [0, 0, 0, 0], [0, 0, 0, 0], [0.5, 0, 0, 0.5]], - dtype=np.complex, + dtype=complex, ) maximally_mixed = np.array( [[0.25, 0, 0, 0], [0, 0.25, 0, 0], [0, 0, 0.25, 0], [0, 0, 0, 0.25]], - dtype=np.complex, + dtype=complex, ) return ( StateSampler( From ed435d4b9da3dee87aadae23cfa95857ad358999 Mon Sep 17 00:00:00 2001 From: mvanhooft Date: Mon, 18 Nov 2024 17:35:39 +0100 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 7 ++++--- setup.cfg | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e889bd..074e140 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ CHANGELOG ========= -2024-11-2 (0.13.3) +2024-11-18 (0.13.3) ------------------ -- Relax scipy requirement - +- Relax scipy requirement to from <1.9 to <2.0 +- Relax numpy requirement from <1.23 to <2.0 +- Replace numpy.complex type with complex type 2024-10-21 (0.13.2) ------------------ diff --git a/setup.cfg b/setup.cfg index 9b01618..21cbee6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,7 +17,7 @@ install_requires = netsquid-netbuilder >=0.1.0, <0.2.0 click >=8.0, <9.0 numpy >=1.22, <2.0 - scipy >=1.8, <2 + scipy >=1.8, <2.0 pydantic >=1.8.2, < 3.0 pydynaa >=0.3, <2.0 netsquid >=1.1.2, <2.0