Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Address a few problems caught by testing with Python 3.12 #588

Merged
merged 4 commits into from
Feb 2, 2024
+6 −6
Merged

Address a few problems caught by testing with Python 3.12 #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d2cd29
Remove unnecessary unittest import from NCL_scatter_10.py
kafitzgerald Jan 31, 2024
c25ad4e
Fix shapefile reads in NCL_topo_8.py
kafitzgerald Jan 31, 2024
d345186
Explicitly add dask to conda_environment.yml
kafitzgerald Jan 31, 2024
30fdbe6
Merge branch 'main' into issue550_python312_part1
kafitzgerald Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Gallery/Scatter/NCL_scatter_10.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
###############################################################################
# Import packages:

from unittest import load_tests
import numpy as np
import matplotlib.pyplot as plt
import cartopy.crs as ccrs
Expand Down
10 changes: 5 additions & 5 deletions Gallery/Topography/NCL_topo_8.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@

# Open shapefile of US counties
open(gdf.get("shape_files/countyl010g.dbf"), 'r')
open(gdf.get("shape_files/states.shp"), 'r')
open(gdf.get("shape_files/states.shx"), 'r')
open(gdf.get("shape_files/states.prj"), 'r')
shapefile_counties = shpreader.Reader(gdf.get("shape_files/countyl010g.dbf"))
open(gdf.get("shape_files/countyl010g.shp"), 'r')
open(gdf.get("shape_files/countyl010g.shx"), 'r')
open(gdf.get("shape_files/countyl010g.prj"), 'r')
shapefile_counties = shpreader.Reader(gdf.get("shape_files/countyl010g.shp"))

# Open shapefile of all rivers. This data can be downloaded from `NOAA: <https://www.weather.gov/gis/Rivers>`_
open(gdf.get("shape_files/rv16my07.dbf"), 'r')
open(gdf.get("shape_files/rv16my07.shx"), 'r')
open(gdf.get("shape_files/rv16my07.shp"), 'r')
open(gdf.get("shape_files/rv16my07.prj"), 'r')
shapefile_rivers = shpreader.Reader(gdf.get("shape_files/rv16my07.dbf"))
shapefile_rivers = shpreader.Reader(gdf.get("shape_files/rv16my07.shp"))

###############################################################################
# Plot:
Expand Down
1 change: 1 addition & 0 deletions conda_environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ dependencies:
- sphinx-design
- sphinx-gallery
- xarray
- dask
- wrf-python
- pip:
- pre-commit
Loading