added numpy as a hard dependency

mozman · Apr 22, 2023 · 788cad0 · 788cad0
1 parent 4e45923
commit 788cad0
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 6 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -6,6 +6,7 @@ Version 1.0.4b1 - dev
 ---------------------
 
 - Release notes: https://ezdxf.mozman.at/release-v1-0.html
+- NEW: `numpy` is a hard dependency
 - NEW: added setter to `BlockLayout.base_point` property
 - NEW: optimized `Matrix44.fast_2d_transform()` method
 - BUGFIX: invalid bulge to Bezier curve conversion for bulge values >= 1

diff --git a/README.md b/README.md
@@ -25,7 +25,8 @@ Quick-Info
 - has type annotations and passes `mypy --ignore-missing-imports -p ezdxf` successful
 - additional required packages for the core package without add-ons: 
   [typing_extensions](https://pypi.org/project/typing-extensions/), 
-  [pyparsing](https://pypi.org/project/pyparsing/) 
+  [pyparsing](https://pypi.org/project/pyparsing/),
+  [numpy](https://pypi.org/project/numpy/),
 - read/write/new support for DXF versions: R12, R2000, R2004, R2007, R2010, R2013 and R2018
 - additional read-only support for DXF versions R13/R14 (upgraded to R2000)
 - additional read-only support for older DXF versions than R12 (upgraded to R12)

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -22,7 +22,8 @@ Quick-Info
 - has type annotations and passes ``mypy --ignore-missing-imports -p ezdxf`` successful
 - additional required packages for the core package without add-ons:
   `typing_extensions <https://pypi.org/project/typing-extensions/>`_,
-  `pyparsing <https://pypi.org/project/pyparsing/>`_
+  `pyparsing <https://pypi.org/project/pyparsing/>`_,
+  `numpy <https://pypi.org/project/numpy/>`_
 - read/write/new support for DXF versions: R12, R2000, R2004, R2007, R2010, R2013 and R2018
 - additional read-only support for DXF versions R13/R14 (upgraded to R2000)
 - additional read-only support for older DXF versions than R12 (upgraded to R12)

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,5 +1,6 @@
 pyparsing>=2.0.1
 typing_extensions
+numpy
 pytest
 geomdl
 cython

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
 pyparsing>=2.0.1
 typing_extensions
+numpy
diff --git a/setup.py b/setup.py
@@ -157,7 +157,7 @@ def read_until(lines):
     provides=["ezdxf"],
     cmdclass=commands,
     ext_modules=ext_modules,
-    install_requires=["pyparsing>=2.0.1", "typing_extensions"],
+    install_requires=["pyparsing>=2.0.1", "typing_extensions", "numpy"],
     setup_requires=["wheel"],
     tests_require=["pytest", "geomdl"],
     extras_require={

diff --git a/src/ezdxf/addons/hpgl2/backend.py b/src/ezdxf/addons/hpgl2/backend.py
@@ -14,7 +14,7 @@
     BoundingBox2d,
 )
 from .properties import Properties, Pen
-from ezdxf.addons.npshapes import NumpyPath, NumpyPolyline
+from ezdxf.npshapes import NumpyPath, NumpyPolyline
 
 # Page coordinates are always plot units:
 # 1 plot unit (plu) = 0.025mm

diff --git a/src/ezdxf/addons/npshapes.py → src/ezdxf/npshapes.py b/src/ezdxf/addons/npshapes.py → src/ezdxf/npshapes.py
diff --git a/tests/test_08_addons/test_822_npshapes.py → tests/test_05_tools/test_539_npshapes.py b/tests/test_08_addons/test_822_npshapes.py → tests/test_05_tools/test_539_npshapes.py
@@ -3,8 +3,7 @@
 
 import pytest
 
-pytest.importorskip("numpy")  # requires numpy!
-from ezdxf.addons.npshapes import NumpyPolyline, NumpyPath
+from ezdxf.npshapes import NumpyPolyline, NumpyPath
 from ezdxf.math import Matrix44, BoundingBox2d
 from ezdxf.path import Path2d, Command
 

diff --git a/tox-extras.ini b/tox-extras.ini
@@ -13,6 +13,7 @@ deps =
     numpy
     pytest
     typing_extensions
+    numpy
     pyparsing
     geomdl
     matplotlib

diff --git a/tox-template.ini b/tox-template.ini
@@ -13,6 +13,7 @@ deps =
     pytest
     typing_extensions
     pyparsing
+    numpy
     geomdl
 
 setenv =
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ deps = @@
         numpy
         pytest
         typing_extensions
+        numpy
         pyparsing
         geomdl
         matplotlib
@@ Expand Down @@