femagtools 1.6.8__tar.gz → 1.7.0__tar.gz

{femagtools-1.6.8 → femagtools-1.7.0}/LICENSE

@@ -1,4 +1,5 @@
 Copyright (c) 2016-2023, Semafor Informatik & Energie AG, Basel
+Copyright (c) 2023-2024, Gamma Technology LLC
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

{femagtools-1.6.8/src/femagtools.egg-info → femagtools-1.7.0}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: femagtools
-Version: 1.6.8
+Version: 1.7.0
 Summary: Python API for FEMAG
 Author-email: Ronald Tanner <tar@semafor.ch>, Dapu Zhang <dzhang@gtisoft.com>, Beat Holm <hob@semafor.ch>, Günther Amsler <amg@semafor.ch>, Nicolas Mauchle <mau@semafor.ch>
 License: Copyright (c) 2016-2023, Semafor Informatik & Energie AG, Basel
+        Copyright (c) 2023-2024, Gamma Technology LLC
         All rights reserved.
         
         Redistribution and use in source and binary forms, with or without
@@ -59,6 +60,8 @@ Provides-Extra: zmq
 Requires-Dist: pyzmq; extra == "zmq"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
+Provides-Extra: all
+Requires-Dist: femagtools[dxfsl,meshio,mplot,svgfsl,test,vtk,zmq]; extra == "all"
 
 
 # Introduction to Femagtools
@@ -81,14 +84,14 @@ Femagtools is an Open-Source Python-API for FEMAG offering following features:
 * calculate machine characteristics by using analytic machine models
 * execute parameter studies and multi-objective optimization
 
-The package can be used with Python 3.x on Linux, MacOS or Windows and is hosted on github: <https://github.com/SEMAFORInformatik/femagtools/>` where also many examples can be found in the examples directory. Contributions and feedback to this project are highly welcome.
+The package can be used with Python 3.x on Linux, MacOS or Windows and is hosted on github: <https://github.com/SEMAFORInformatik/femagtools/> where also many examples can be found in the examples directory. Contributions and feedback to this project are highly welcome.
 
 The installation can be done in the usual ways with pip:
 
 ```
-pip install femagtools[all]
+pip install 'femagtools[all]'
 ```
-([all] pulls in all optional dependencies.
+`[all]` pulls in all optional dependencies. Up-to-date information about optional dependencies can be found in the [pyproject.toml](pyproject.toml) file under `[project.optional-dependencies]`.
 
 For details see the documentation <http://docs.semafor.ch/femagtools>
 

{femagtools-1.6.8 → femagtools-1.7.0}/README.md

@@ -19,14 +19,14 @@ Femagtools is an Open-Source Python-API for FEMAG offering following features:
 * calculate machine characteristics by using analytic machine models
 * execute parameter studies and multi-objective optimization
 
-The package can be used with Python 3.x on Linux, MacOS or Windows and is hosted on github: <https://github.com/SEMAFORInformatik/femagtools/>` where also many examples can be found in the examples directory. Contributions and feedback to this project are highly welcome.
+The package can be used with Python 3.x on Linux, MacOS or Windows and is hosted on github: <https://github.com/SEMAFORInformatik/femagtools/> where also many examples can be found in the examples directory. Contributions and feedback to this project are highly welcome.
 
 The installation can be done in the usual ways with pip:
 
 ```
-pip install femagtools[all]
+pip install 'femagtools[all]'
 ```
-([all] pulls in all optional dependencies.
+`[all]` pulls in all optional dependencies. Up-to-date information about optional dependencies can be found in the [pyproject.toml](pyproject.toml) file under `[project.optional-dependencies]`.
 
 For details see the documentation <http://docs.semafor.ch/femagtools>
 

{femagtools-1.6.8 → femagtools-1.7.0}/pyproject.toml

@@ -33,12 +33,13 @@ dynamic = ["version"]
 
 [project.optional-dependencies]
 dxfsl = ['dxfgrabber', 'networkx']
-svgfsl = ['dxfgrabber', 'networkx','lxml']
+svgfsl = ['dxfgrabber', 'networkx', 'lxml']
 mplot =  ['matplotlib']
 meshio = ['meshio']
 vtk = ['vtk']
 zmq = ['pyzmq']
 test = ['pytest']
+all = ['femagtools[dxfsl,svgfsl,mplot,meshio,vtk,zmq,test]']    # add new dependency groups here as well
 
 [project.scripts]
 femagtools-plot = "femagtools.plot.bch:main"

{femagtools-1.6.8 → femagtools-1.7.0}/src/femagtools/__init__.py

@@ -2,10 +2,10 @@
 
 """
 __title__ = 'femagtools'
-__version__ = '1.6.8'
+__version__ = '1.7.0'
 __author__ = 'Ronald Tanner'
 __license__ = 'BSD'
-__copyright__ = 'Copyright 2016-2022 SEMAFOR Informatik & Energie AG'
+__copyright__ = 'Copyright 2023-2024 Gamma Technology'
 
 from .asm import read
 from .bch import Reader

{femagtools-1.6.8 → femagtools-1.7.0}/src/femagtools/bch.py

@@ -296,7 +296,7 @@ class Reader:
     def __findNums(self, l):
         rec = self._numPattern.findall(l)
         if 3 * '*' in l:  # min 3 '*'
-            li = re.sub(r'[\*]+', str(np.NaN), l)
+            li = re.sub(r'[\*]+', str(np.nan), l)
             rec = self._numPatternNaN.findall(li)
             logger.debug("Numbers with **** In: %s", l)
             logger.debug("Out: %s", li)