Merge pull request #96 from equinor/numpy2

Remove numpy-1.x dependency restriction as zfpy and pyzgy are np-2.x compatible

Author: da-wad

requirements-dev.txt

@@ -3,4 +3,4 @@ matplotlib
 pytest
 mock
 fonttools>=4.43.0 # not directly required, pinned by Snyk to avoid a vulnerability
-numpy>=1.22.2,<2.0.0 # not directly required, pinned by Snyk to avoid a vulnerability
+numpy>=1.22.2 # not directly required, pinned by Snyk to avoid a vulnerability

requirements.txt

@@ -1,4 +1,4 @@
-numpy>=1.20,<2.0.0 # not directly required, pinned by Snyk to avoid a vulnerability
+numpy>=1.20 # not directly required, pinned by Snyk to avoid a vulnerability
 segyio
 psutil
 zfpy

seismic_zfp/headers.py

@@ -143,11 +143,11 @@ def get_zgy_header_arrays(self):
         easting_inc_xl = (corners[2][0] - corners[0][0]) / (self.seismicfile.n_xlines - 1)
         northing_inc_xl = (corners[2][1] - corners[0][1]) / (self.seismicfile.n_xlines - 1)
 
-        cdp_x = np.round_(100.0 * (corners[0][0]
+        cdp_x = np.round(100.0 * (corners[0][0]
                                    + iline_idx * easting_inc_il
                                    + xline_idx * easting_inc_xl)
                           ).astype(np.intc)
-        cdp_y = np.round_(100.0 * (corners[0][1]
+        cdp_y = np.round(100.0 * (corners[0][1]
                                    + iline_idx * northing_inc_il
                                    + xline_idx * northing_inc_xl)
                           ).astype(np.intc)

setup.py

@@ -24,7 +24,7 @@ def get_long_description():
                  license='LGPL-3.0',
 
                  use_scm_version=True,
-                 install_requires=['numpy>=1.20,<2.0.0', 'segyio', 'zfpy', 'psutil', 'click'],
+                 install_requires=['numpy', 'segyio', 'zfpy', 'psutil', 'click'],
                  extras_require={
                      'zgy': ['pyzgy'],
                      'vds': ['pyvds'],