Skip to content

Commit eff116c

Browse files
APN-PuckyAPN-Pucky
committed
Use warnings deprecated
1 parent c7654cc commit eff116c

File tree

6 files changed

+33
-29
lines changed

6 files changed

+33
-29
lines changed

‎pyfeyn2/feynmandiagram.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""Moved to :py:mod:`feynml`"""
22
from importlib.metadata import version
3+
from warnings import deprecated
34

45
# from feynml.feynml import Tool as Tool_
56
from feynml import PDG as PDG_
@@ -14,14 +15,13 @@
1415
from feynml import Styled as Styled_
1516
from feynml import Vertex as Vertex_
1617
from feynml.momentum import Momentum as Momentum_ # TODO fix to feynml only
17-
from smpl_doc import doc
1818

1919

2020
class Head(Head_):
2121
class Meta(Head_.Meta):
2222
pass
2323

24-
@doc.deprecated("2.2.6", "Directly use feynml.head.Head")
24+
@deprecated("2.2.6", "Directly use feynml.head.Head")
2525
def __init__(self, *args, **kwargs):
2626
super().__init__(*args, **kwargs)
2727

@@ -30,7 +30,7 @@ class Meta(Meta_):
3030
class Meta(Meta_.Meta):
3131
pass
3232

33-
@doc.deprecated("2.2.6", "Directly use feynml.meta.Meta")
33+
@deprecated("2.2.6", "Directly use feynml.meta.Meta")
3434
def __init__(self, *args, **kwargs):
3535
super().__init__(*args, **kwargs)
3636

@@ -39,13 +39,13 @@ def __init__(self, *args, **kwargs):
3939
# class Meta(Tool_.Meta):
4040
# pass
4141
#
42-
# @doc.deprecated("2.2.6", "Directly use feynml.feynml.Tool")
42+
# @deprecated("2.2.6", "Directly use feynml.feynml.Tool")
4343
# def __init__(self, *args, **kwargs):
4444
# super().__init__(*args, **kwargs)
4545

4646

4747
class Connector(Connector_):
48-
@doc.deprecated("2.2.6", "Directly use feynml.connector.Connector")
48+
@deprecated("2.2.6", "Directly use feynml.connector.Connector")
4949
def __init__(self, *args, **kwargs):
5050
super().__init__(*args, **kwargs)
5151

@@ -54,13 +54,13 @@ class FeynmanDiagram(FeynmanDiagram_):
5454
class Meta(FeynmanDiagram_.Meta):
5555
pass
5656

57-
@doc.deprecated("2.2.6", "Directly use feynml.feynmandiagram.FeynDiagram")
57+
@deprecated("2.2.6", "Directly use feynml.feynmandiagram.FeynDiagram")
5858
def __init__(self, *args, **kwargs):
5959
super().__init__(*args, **kwargs)
6060

6161

6262
class Leg(Leg_):
63-
@doc.deprecated("2.2.6", "Directly use feynml.leg.Leg")
63+
@deprecated("2.2.6", "Directly use feynml.leg.Leg")
6464
def __init__(self, *args, **kwargs):
6565
super().__init__(*args, **kwargs)
6666

@@ -69,42 +69,42 @@ class Momentum(Momentum_):
6969
class Meta(Momentum_.Meta):
7070
pass
7171

72-
@doc.deprecated("2.2.6", "Directly use feynml.momentum.Momentum")
72+
@deprecated("2.2.6", "Directly use feynml.momentum.Momentum")
7373
def __init__(self, *args, **kwargs):
7474
super().__init__(*args, **kwargs)
7575

7676

7777
class PDG(PDG_):
78-
@doc.deprecated("2.2.6", "Directly use feynml.pdgid.PDG")
78+
@deprecated("2.2.6", "Directly use feynml.pdgid.PDG")
7979
def __init__(self, *args, **kwargs):
8080
super().__init__(*args, **kwargs)
8181

8282

8383
class Vertex(Vertex_):
84-
@doc.deprecated("2.2.6", "Directly use feynml.vertex.Vertex")
84+
@deprecated("2.2.6", "Directly use feynml.vertex.Vertex")
8585
def __init__(self, *args, **kwargs):
8686
super().__init__(*args, **kwargs)
8787

8888

8989
class Styled(Styled_):
90-
@doc.deprecated("2.2.6", "Directly use feynml.styled.Styled")
90+
@deprecated("2.2.6", "Directly use feynml.styled.Styled")
9191
def __init__(self, *args, **kwargs):
9292
super().__init__(*args, **kwargs)
9393

9494

9595
class Propagator(Propagator_):
96-
@doc.deprecated("2.2.6", "Directly use feynml.propagator.Propagator")
96+
@deprecated("2.2.6", "Directly use feynml.propagator.Propagator")
9797
def __init__(self, *args, **kwargs):
9898
super().__init__(*args, **kwargs)
9999

100100

101101
class Point(Point_):
102-
@doc.deprecated("2.2.6", "Directly use feynml.point.Point")
102+
@deprecated("2.2.6", "Directly use feynml.point.Point")
103103
def __init__(self, *args, **kwargs):
104104
super().__init__(*args, **kwargs)
105105

106106

107-
# @doc.deprecated("2.2.6", "Directly use feynml.feynml.FeynML")
107+
# @deprecated("2.2.6", "Directly use feynml.feynml.FeynML")
108108
class FeynML(FeynML_):
109109
"""FeynML with pyfeyn2 meta tag."""
110110

‎pyfeyn2/interface/hepmc.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
"""Moved to :py:mod:`feynml.interface.hepmc`"""
2+
from warnings import deprecated
3+
24
from feynml.interface.hepmc import hepmc_event_to_feynman as _event_to_feynman
3-
from smpl_doc import doc
45

5-
event_to_feynman = doc.deprecated(
6+
event_to_feynman = deprecated(
67
"2.2.6", "Directly use feynml.interface.hepmc.event_to_feynman()"
78
)(_event_to_feynman)

‎pyfeyn2/interface/qgraf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Moved to :py:mod:`feynml.interface.qgraf`"""
22
from feynml.interface.qgraf import get_style as _get_style
3-
from smpl_doc import doc
3+
from warings import deprecated
44

5-
get_style = doc.deprecated("2.2.6", "Directly use feynml.interface.qgraf.get_style()")(
5+
get_style = deprecated("2.2.6", "Directly use feynml.interface.qgraf.get_style()")(
66
_get_style
77
)

‎pyfeyn2/render/all.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@
3434
"madgraph": MadGraphRender,
3535
}
3636

37+
try:
38+
from pyfeyn2.render.root.rootpdfrender import ROOTPDFRender
39+
40+
renders["root"] = ROOTPDFRender
41+
except ImportError:
42+
pass
43+
3744

3845
def class_for_name(module_name, class_name):
3946
# load the module, will raise ImportError if module cannot be loaded

‎pyfeyn2/render/root/pyfeyn.py‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Adapted code from https://github.com/aminnj/pyfeyn/blob/main/pyfeyn.py
22
import math
33

4+
import ROOT
5+
import ROOT as r
6+
47

58
class Label(object):
69
def __init__(
@@ -36,11 +39,10 @@ def transform_text(self, text):
3639
return text
3740

3841
def draw(self):
39-
import ROOT
4042

4143
if not self.text:
4244
return
43-
t = ROOT.TLatex()
45+
t = r.TLatex()
4446
t.SetTextAlign(self.textalign)
4547
t.SetTextSize(self.textsize)
4648
t.DrawLatex(
@@ -63,11 +65,9 @@ def set_location(self, x, y):
6365
self.y = y
6466

6567
def draw(self):
66-
import ROOT
67-
6868
if self.color is None:
6969
return
70-
m = ROOT.TEllipse(self.x, self.y, self.radius)
70+
m = r.TEllipse(self.x, self.y, self.radius)
7171
m.SetFillColor(self.color)
7272
m.SetLineWidth(self.linewidth)
7373
m.Draw()
@@ -103,10 +103,8 @@ def __init__(
103103
fliparrow=False,
104104
noarrow=False,
105105
):
106-
import ROOT
107-
108106
if linecolor is None:
109-
linecolor = ROOT.kBlack
107+
linecolor = r.kBlack
110108
self.v1 = v1
111109
self.v2 = v2
112110
self.typ = typ
@@ -122,8 +120,6 @@ def __init__(
122120
)
123121

124122
def draw(self, _nodelete=[]):
125-
import ROOT as r
126-
127123
prop1, prop2 = None, None
128124
drawopt = ""
129125
if self.typ == "line":

‎pyfeyn2/render/root/rootrender.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import tempfile
22
from typing import List
33

4+
import ROOT
45
from pylatex import Command
56
from pylatex.utils import NoEscape
67

@@ -45,7 +46,6 @@ def render(
4546
width = 600
4647
if height is None:
4748
height = 600
48-
import ROOT
4949

5050
minx, miny, maxx, maxy = self.fd.get_bounding_box()
5151
canvas = ROOT.TCanvas("c", "A canvas", 10, 10, width, height)

0 commit comments

Comments
 (0)