From 67b83475cd333901e23f7a6de0fa0b0d27fdb47f Mon Sep 17 00:00:00 2001 From: Manuel Huber Date: Tue, 24 Sep 2024 11:56:24 +0200 Subject: [PATCH 1/3] remove ignoring of DeprecationWarnings should be fixed in upstream dateutil since March --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 09c4169de..832cfab60 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -91,7 +91,7 @@ metadata.version.provider = "scikit_build_core.metadata.setuptools_scm" minversion = "6.0" addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"] xfail_strict = true -filterwarnings = ["error", "ignore::DeprecationWarning"] +filterwarnings = "error" log_cli_level = "info" testpaths = "tests" From d1d8fd91780ff5543605fa4006ef4a64e8f6649c Mon Sep 17 00:00:00 2001 From: Manuel Huber Date: Tue, 24 Sep 2024 12:29:26 +0200 Subject: [PATCH 2/3] Remove itertools.count usage in fluka_registry.py --- src/pyg4ometry/fluka/fluka_registry.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/pyg4ometry/fluka/fluka_registry.py b/src/pyg4ometry/fluka/fluka_registry.py index 02909af46..7fe0fd34b 100644 --- a/src/pyg4ometry/fluka/fluka_registry.py +++ b/src/pyg4ometry/fluka/fluka_registry.py @@ -2,8 +2,6 @@ from collections import OrderedDict as _OrderedDict from collections.abc import MutableMapping as _MutableMapping -from itertools import count as _count - import numpy as _np import pandas as _pd import pyg4ometry.geant4 as _g4 @@ -566,9 +564,8 @@ class RotoTranslationStore(_MutableMapping): def __init__(self): self._nameMap = _OrderedDict() - # internal infinite counter generating new unique - # transformation indices. - self._counter = _count(start=2000, step=1000) + # internal counter generating new unique transformation indices. + self._counter = 2000 def __getitem__(self, name): return self._nameMap[name] @@ -603,7 +600,8 @@ def addRotoTranslation(self, rtrans): # adding of RotoTranslations easier. recur = _RecursiveRotoTranslation(name, [rtrans]) if not rtrans.transformationIndex: - recur.transformationIndex = next(self._counter) + recur.transformationIndex = self._counter + self._counter += 1000 elif rtrans.transformationIndex in self.allTransformationIndices(): msg = "transformation index matches another ROT-DEFI with a different name. Change the transformationIndex and try again." raise KeyError(msg) From e6c578e9cdf16c03cbb99bd18cf2eab2fb2bf397 Mon Sep 17 00:00:00 2001 From: Manuel Huber Date: Tue, 24 Sep 2024 12:43:13 +0200 Subject: [PATCH 3/3] replace deprecated attribute access in fluka preprocessor --- src/pyg4ometry/fluka/preprocessor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pyg4ometry/fluka/preprocessor.py b/src/pyg4ometry/fluka/preprocessor.py index 2af2f27b1..4efc777d5 100644 --- a/src/pyg4ometry/fluka/preprocessor.py +++ b/src/pyg4ometry/fluka/preprocessor.py @@ -227,7 +227,7 @@ def visit_UnaryOp(self, node): return op(operand) def visit_Constant(self, node): - return node.n + return node.value def visit_Name(self, node): name = node.id