Skip to content

Commit

Permalink
NumPy 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jooste committed Sep 2, 2024
1 parent 010a423 commit 56ae5de
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions bluesky/ui/qtgl/glnavdata.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def actdata_changed(self, nodeid, nodedata, changed_elems):
self.customwp.update(lat=nodedata.custwplat,
lon=nodedata.custwplon)
self.custwplblbuf.update(
np.array(nodedata.custwplbl, dtype=np.string_))
np.array(nodedata.custwplbl, dtype=np.bytes_))
self.ncustwpts = len(nodedata.custwplat)

def create(self):
Expand Down Expand Up @@ -120,7 +120,7 @@ def create(self):
if len(wptid) <= 3:
self.nnavaids += 1
wptids += wptid[:5].ljust(5)
npwpids = np.array(wptids, dtype=np.string_)
npwpids = np.array(wptids, dtype=np.bytes_)
self.wptlabels.create(npwpids, self.waypoints.lat,
self.waypoints.lon, palette.wptlabel,
(wpt_size, 0.5 * wpt_size), instanced=True)
Expand Down Expand Up @@ -155,7 +155,7 @@ def create(self):
aptids = ''
for aptid in apnames:
aptids += aptid.ljust(4)
self.aptlabels.create(np.array(aptids, dtype=np.string_),
self.aptlabels.create(np.array(aptids, dtype=np.bytes_),
self.airports.lat, self.airports.lon,
palette.aptlabel, (apt_size, 0.5 * apt_size),
instanced=True)
Expand Down
2 changes: 1 addition & 1 deletion bluesky/ui/qtgl/gltraffic.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ def update_aircraft_data(self, data):

self.cpalines.update(vertex=cpalines)
self.color.update(color)
self.lbl.update(np.array(rawlabel.encode('utf8'), dtype=np.string_))
self.lbl.update(np.array(rawlabel.encode('utf8'), dtype=np.bytes_))

# If there is a visible route, update the start position
if self.route_acid in data.id:
Expand Down
10 changes: 5 additions & 5 deletions requirements-gui.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ PyQt6
PyQt6-WebEngine
pygame
pyopengl
numpy
scipy
pandas
matplotlib
msgpack
numpy >= 2.0.0
scipy >= 1.13.0
matplotlib >= 3.9.0
pandas >= 2.2.0
msgpack >= 1.0.0
zmq
textual
bluesky-simdata
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
numpy
scipy
matplotlib
numpy >= 2.0.0
scipy >= 1.13.0
matplotlib >= 3.9.0
msgpack >= 1.0.0
zmq
pandas
pandas >= 2.2.0
bluesky-simdata

0 comments on commit 56ae5de

Please sign in to comment.