pyuvdata 2.4.4__tar.gz → 2.4.5__tar.gz

{pyuvdata-2.4.4 → pyuvdata-2.4.5}/.circleci/config.yml

@@ -47,7 +47,7 @@ jobs:
           name: install
           command: |
             source ./ci/_activate_current_env.sh
-            CFLAGS="-DCYTHON_TRACE=1 -DCYTHON_TRACE_NOGIL=1" pip install .
+            CFLAGS="-DCYTHON_TRACE=1 -DCYTHON_TRACE_NOGIL=1" pip install --no-deps .
       - run:
           name: run pyuvdata tests
           command: |
@@ -108,7 +108,7 @@ jobs:
           name: install
           command: |
             source ./ci/_activate_current_env.sh
-            pip install -e .
+            pip install --no-deps -e .
       - run:
           name: run tutorial tests
           command: |

{pyuvdata-2.4.4 → pyuvdata-2.4.5}/.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
         - id: mixed-line-ending
           args: ['--fix=no']
   - repo: https://github.com/pycqa/flake8
-    rev: '7.0.0'
+    rev: '7.1.0'
     hooks:
       - id: flake8
         additional_dependencies:
@@ -35,7 +35,7 @@ repos:
       - id: black
 
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.8
+    rev: 1.7.9
     hooks:
       - id: bandit
         args: [--skip, "B101", --recursive, pyuvdata]

{pyuvdata-2.4.4 → pyuvdata-2.4.5}/CHANGELOG.md

@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.4.5] - 2024-6-28
+
+### Changed
+- numpy c-api for 2.0 compatibility
+- numpy.string_ calls to numpy.bytes_, np.in1d to np.isin and a few other changes
+for numpy 2.0 compatibility.
+
+### Fixed
+- Fixed #1445 in which in some corner cases the `antpairs` array was not correctly interpreted as int.
+
 ## [2.4.4] - 2024-6-7
 
 ### Changed

{pyuvdata-2.4.4 → pyuvdata-2.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyuvdata
-Version: 2.4.4
+Version: 2.4.5
 Summary: an interface for astronomical interferometeric datasets in python
 Home-page: https://github.com/RadioAstronomySoftwareGroup/pyuvdata
 Author: Radio Astronomy Software Group
@@ -29,29 +29,35 @@ Provides-Extra: astroquery
 Requires-Dist: astroquery>=0.4.4; extra == "astroquery"
 Provides-Extra: casa
 Requires-Dist: python-casacore>=3.5.2; extra == "casa"
+Requires-Dist: numpy<2.0,>=1.23; extra == "casa"
 Provides-Extra: hdf5-compression
 Requires-Dist: hdf5plugin>=3.2.0; extra == "hdf5-compression"
 Provides-Extra: healpix
 Requires-Dist: astropy_healpix>=1.0.2; extra == "healpix"
 Provides-Extra: lunar
 Requires-Dist: lunarsky>=0.2.2; extra == "lunar"
+Requires-Dist: numpy<2.0,>=1.23; extra == "lunar"
 Provides-Extra: novas
 Requires-Dist: novas; extra == "novas"
 Requires-Dist: novas_de405; extra == "novas"
 Provides-Extra: all
 Requires-Dist: astroquery>=0.4.4; extra == "all"
 Requires-Dist: python-casacore>=3.5.2; extra == "all"
+Requires-Dist: numpy<2.0,>=1.23; extra == "all"
 Requires-Dist: hdf5plugin>=3.2.0; extra == "all"
 Requires-Dist: astropy_healpix>=1.0.2; extra == "all"
 Requires-Dist: lunarsky>=0.2.2; extra == "all"
+Requires-Dist: numpy<2.0,>=1.23; extra == "all"
 Requires-Dist: novas; extra == "all"
 Requires-Dist: novas_de405; extra == "all"
 Provides-Extra: test
 Requires-Dist: astroquery>=0.4.4; extra == "test"
 Requires-Dist: python-casacore>=3.5.2; extra == "test"
+Requires-Dist: numpy<2.0,>=1.23; extra == "test"
 Requires-Dist: hdf5plugin>=3.2.0; extra == "test"
 Requires-Dist: astropy_healpix>=1.0.2; extra == "test"
 Requires-Dist: lunarsky>=0.2.2; extra == "test"
+Requires-Dist: numpy<2.0,>=1.23; extra == "test"
 Requires-Dist: novas; extra == "test"
 Requires-Dist: novas_de405; extra == "test"
 Requires-Dist: pytest>=6.2.5; extra == "test"
@@ -68,9 +74,11 @@ Requires-Dist: pypandoc; extra == "doc"
 Provides-Extra: dev
 Requires-Dist: astroquery>=0.4.4; extra == "dev"
 Requires-Dist: python-casacore>=3.5.2; extra == "dev"
+Requires-Dist: numpy<2.0,>=1.23; extra == "dev"
 Requires-Dist: hdf5plugin>=3.2.0; extra == "dev"
 Requires-Dist: astropy_healpix>=1.0.2; extra == "dev"
 Requires-Dist: lunarsky>=0.2.2; extra == "dev"
+Requires-Dist: numpy<2.0,>=1.23; extra == "dev"
 Requires-Dist: novas; extra == "dev"
 Requires-Dist: novas_de405; extra == "dev"
 Requires-Dist: pytest>=6.2.5; extra == "dev"

{pyuvdata-2.4.4 → pyuvdata-2.4.5}/docs/references/uvh5_memo.tex

@@ -9,13 +9,13 @@
 \usepackage{geometry}
 \geometry{letterpaper}
 \usepackage{graphicx}
-\usepackage[titletoc,toc,title]{appendix}							
+\usepackage[titletoc,toc,title]{appendix}
 \usepackage{amssymb}
 \usepackage{physics}
 \usepackage{array}
 \usepackage{makecell}
 
-\usepackage{hyperref} 
+\usepackage{hyperref}
 \hypersetup{
     colorlinks = true
 }
@@ -230,7 +230,7 @@ The next level keys must include:
 	  Driftscan means a phase center with a fixed azimuth and
 	  elevation (note that this includes w-projection, even at zenith).
 	  Unprojected means no phasing, including w-projection, has been applied.
-  	\item \textbf{cat\_lon}: \textit{float} 
+  	\item \textbf{cat\_lon}: \textit{float}
 	  The longitudinal coordinate of the phase center, either a single value or a
 	  one dimensional array of length Npts (the number of ephemeris data points)
 	  for ephem type phase centers.
@@ -746,7 +746,7 @@ import h5py
 with h5py.File('test_file.uvh5', 'w') as f:
     header = f.create_group('Header')
     # scalar dataset
-    header['scalar_string'] = np.string_('Hello world!')
+    header['scalar_string'] = np.bytes_('Hello world!')
 
     # array dataset
     str_array = np.array(['hello', 'world'])
@@ -776,11 +776,11 @@ import h5py
 with h5py.File('test_file.uvh5', 'w') as f:
     header = f.create_group('Header')
     # scalar dataset
-    header['scalar_string'] = np.string_('Hello world!')
+    header['scalar_string'] = np.bytes_('Hello world!')
 
     # array dataset
     str_array = ['hello', 'world']
-    header['array_string'] = np.string_(str_array)
+    header['array_string'] = np.bytes_(str_array)
 
 # read the data back in again
 with h5py.File('test_file.uvh5', 'r') as f:

{pyuvdata-2.4.4 → pyuvdata-2.4.5}/docs/uvcal_tutorial.rst

@@ -330,7 +330,7 @@ b) Select antennas to keep using the antenna names, also select frequencies to k
   >>> cal = UVCal.from_file(filename, use_future_array_shapes=True)
 
   >>> # print all the antenna names with data in the original file
-  >>> print([cal.antenna_names[np.where(cal.antenna_numbers==a)[0][0]] for a in cal.ant_array])
+  >>> print([str(cal.antenna_names[np.where(cal.antenna_numbers==a)[0][0]]) for a in cal.ant_array])
   ['ant0', 'ant1', 'ant11', 'ant12', 'ant13', 'ant23', 'ant24', 'ant25']
 
   >>> # print the first 10 frequencies in the original file
@@ -340,7 +340,7 @@ b) Select antennas to keep using the antenna names, also select frequencies to k
   >>> cal.select(antenna_names=['ant11', 'ant13', 'ant25'], freq_chans=np.arange(0, 4))
 
   >>> # print all the antenna names with data after the select
-  >>> print([cal.antenna_names[np.where(cal.antenna_numbers==a)[0][0]] for a in cal.ant_array])
+  >>> print([str(cal.antenna_names[np.where(cal.antenna_numbers==a)[0][0]]) for a in cal.ant_array])
   ['ant11', 'ant13', 'ant25']
 
   >>> # print all the frequencies after the select

{pyuvdata-2.4.4 → pyuvdata-2.4.5}/docs/uvdata_tutorial.rst

@@ -1059,7 +1059,7 @@ c) Select a few antenna pairs to keep
 
   >>> # note that order of the values in the pair does not matter
   >>> # print all the antenna pairs after the select
-  >>> print(sorted(set(zip(uvd.ant_1_array, uvd.ant_2_array))))
+  >>> print(sorted(set(zip(uvd.ant_1_array.tolist(), uvd.ant_2_array.tolist()))))
   [(1, 2), (1, 7), (1, 21)]
 
 d) Select antenna pairs using baseline numbers
@@ -1083,7 +1083,7 @@ d) Select antenna pairs using baseline numbers
   >>> # print unique baselines and antennas after select
   >>> print(np.unique(uvd.baseline_array))
   [73736 73753 81945]
-  >>> print(list(set(zip(uvd.ant_1_array, uvd.ant_2_array))))
+  >>> print(list(set(zip(uvd.ant_1_array.tolist(), uvd.ant_2_array.tolist()))))
   [(8, 25), (4, 25), (4, 8)]
 
 e) Select polarizations
@@ -2039,19 +2039,16 @@ in the full data array based on redundancy.
   >>> uv_backup = uv0.copy()
   >>> uvd2 = uv0.compress_by_redundancy(method="select", tol=tol, inplace=False)
   >>> uv0.compress_by_redundancy(method="select", tol=tol)
-  >>> uvd2 == uv0
-  True
+  >>> assert uvd2 == uv0
 
   >>> # Note -- Compressing and inflating changes the baseline order, reorder before comparing.
   >>> uv0.inflate_by_redundancy(tol=tol)
   >>> uv_backup.reorder_blts(conj_convention="u>0", uvw_tol=tol)
   >>> uv0.reorder_blts()
-  >>> np.all(uv0.baseline_array == uv_backup.baseline_array)
-  True
+  >>> assert np.all(uv0.baseline_array == uv_backup.baseline_array)
 
   >>> uvd2.inflate_by_redundancy(tol=tol)
-  >>> uvd2 == uv0
-  True
+  >>> assert uvd2 == uv0
 
 UVData: Normalizing data
 ------------------------

pyuvdata-2.4.5/pyproject.toml

@@ -0,0 +1,18 @@
+[build-system]
+ requires = [
+  "setuptools>=61",
+  "wheel",
+  "setuptools_scm!=7.0.0,!=7.0.1,!=7.0.2",
+  "numpy",
+  "cython>=3.0",
+ ]
+ build-backend = "setuptools.build_meta"
+
+[tool.isort]
+ profile = "black"
+
+[darglint]
+ docstring_style = "numpy"
+
+[tool.black]
+ skip_magic_trailing_comma = true

{pyuvdata-2.4.4 → pyuvdata-2.4.5}/pyuvdata/telescopes.py

@@ -3,6 +3,7 @@
 # Licensed under the 2-clause BSD License
 
 """Telescope information and known telescope list."""
+
 import os
 
 import numpy as np
@@ -205,7 +206,7 @@ def _parse_antpos_file(antenna_positions_file):
     columns = ["name", "number", "x", "y", "z"]
     formats = ["U10", "i8", np.longdouble, np.longdouble, np.longdouble]
 
-    dt = np.format_parser(formats, columns, [])
+    dt = np.rec.format_parser(formats, columns, [])
     ant_array = np.genfromtxt(
         antenna_positions_file,
         delimiter=",",