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.

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

Black formatting #1531

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,11 @@ jobs:
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
doc8 docs | reviewdog -efm='%f:%l: %m' -name=doc8 -reporter=github-check -filter-mode=nofilter

black:
name: Black
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: psf/black@stable
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ docs/tutorials
docs/api/generated
examples/scripts
test_output/

.venv/
6 changes: 3 additions & 3 deletions ci/gen_versions_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@

import glob

with open('versions.json', 'wt') as version_file:
version_strings = ','.join('"{}"'.format(d) for d in sorted(glob.glob('v*.[0-9]*')))
version_file.write('{"versions":["latest","dev",' + version_strings + ']}\n')
with open("versions.json", "wt") as version_file:
version_strings = ",".join('"{}"'.format(d) for d in sorted(glob.glob("v*.[0-9]*")))
version_file.write('{"versions":["latest","dev",' + version_strings + "]}\n")
132 changes: 64 additions & 68 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,27 @@
import metpy.calc

# Need to disable fallback before importing pint
os.environ['PINT_ARRAY_PROTOCOL_FALLBACK'] = '0'
os.environ["PINT_ARRAY_PROTOCOL_FALLBACK"] = "0"
import pint # noqa: I100, E402


def pytest_report_header(config, startdir):
"""Add dependency information to pytest output."""
return (f'Dep Versions: Matplotlib {matplotlib.__version__}, '
f'NumPy {numpy.__version__}, SciPy {scipy.__version__}, '
f'Xarray {xarray.__version__}, Pint {pint.__version__}, '
f'Pandas {pandas.__version__}, Traitlets {traitlets.__version__}, '
f'Pooch {pooch.version.full_version}')
return (
f"Dep Versions: Matplotlib {matplotlib.__version__}, "
f"NumPy {numpy.__version__}, SciPy {scipy.__version__}, "
f"Xarray {xarray.__version__}, Pint {pint.__version__}, "
f"Pandas {pandas.__version__}, Traitlets {traitlets.__version__}, "
f"Pooch {pooch.version.full_version}"
)


@pytest.fixture(autouse=True)
def doctest_available_modules(doctest_namespace):
"""Make modules available automatically to doctests."""
doctest_namespace['metpy'] = metpy
doctest_namespace['metpy.calc'] = metpy.calc
doctest_namespace['plt'] = matplotlib.pyplot
doctest_namespace["metpy"] = metpy
doctest_namespace["metpy.calc"] = metpy.calc
doctest_namespace["plt"] = matplotlib.pyplot


@pytest.fixture()
Expand All @@ -46,7 +48,7 @@ def ccrs():
Any testing function/fixture that needs access to ``cartopy.crs`` can simply add this to
their parameter list.
"""
return pytest.importorskip('cartopy.crs')
return pytest.importorskip("cartopy.crs")


@pytest.fixture
Expand All @@ -56,91 +58,85 @@ def cfeature():
Any testing function/fixture that needs access to ``cartopy.feature`` can simply add this
to their parameter list.
"""
return pytest.importorskip('cartopy.feature')
return pytest.importorskip("cartopy.feature")


@pytest.fixture()
def test_da_lonlat():
"""Return a DataArray with a lon/lat grid and no time coordinate for use in tests."""
pytest.importorskip('cartopy')
pytest.importorskip("cartopy")

data = numpy.linspace(300, 250, 3 * 4 * 4).reshape((3, 4, 4))
ds = xarray.Dataset(
{'temperature': (['isobaric', 'lat', 'lon'], data)},
{"temperature": (["isobaric", "lat", "lon"], data)},
coords={
'isobaric': xarray.DataArray(
numpy.array([850., 700., 500.]),
name='isobaric',
dims=['isobaric'],
attrs={'units': 'hPa'}
"isobaric": xarray.DataArray(
numpy.array([850.0, 700.0, 500.0]),
name="isobaric",
dims=["isobaric"],
attrs={"units": "hPa"},
),
'lat': xarray.DataArray(
"lat": xarray.DataArray(
numpy.linspace(30, 40, 4),
name='lat',
dims=['lat'],
attrs={'units': 'degrees_north'}
name="lat",
dims=["lat"],
attrs={"units": "degrees_north"},
),
'lon': xarray.DataArray(
"lon": xarray.DataArray(
numpy.linspace(260, 270, 4),
name='lon',
dims=['lon'],
attrs={'units': 'degrees_east'}
)
}
name="lon",
dims=["lon"],
attrs={"units": "degrees_east"},
),
},
)
ds['temperature'].attrs['units'] = 'kelvin'
ds["temperature"].attrs["units"] = "kelvin"

return ds.metpy.parse_cf('temperature')
return ds.metpy.parse_cf("temperature")


@pytest.fixture()
def test_da_xy():
"""Return a DataArray with a x/y grid and a time coordinate for use in tests."""
pytest.importorskip('cartopy')
pytest.importorskip("cartopy")

data = numpy.linspace(300, 250, 3 * 3 * 4 * 4).reshape((3, 3, 4, 4))
ds = xarray.Dataset(
{'temperature': (['time', 'isobaric', 'y', 'x'], data),
'lambert_conformal': ([], '')},
{"temperature": (["time", "isobaric", "y", "x"], data), "lambert_conformal": ([], "")},
coords={
'time': xarray.DataArray(
numpy.array([numpy.datetime64('2018-07-01T00:00'),
numpy.datetime64('2018-07-01T06:00'),
numpy.datetime64('2018-07-01T12:00')]),
name='time',
dims=['time']
"time": xarray.DataArray(
numpy.array(
[
numpy.datetime64("2018-07-01T00:00"),
numpy.datetime64("2018-07-01T06:00"),
numpy.datetime64("2018-07-01T12:00"),
]
),
name="time",
dims=["time"],
),
'isobaric': xarray.DataArray(
numpy.array([850., 700., 500.]),
name='isobaric',
dims=['isobaric'],
attrs={'units': 'hPa'}
"isobaric": xarray.DataArray(
numpy.array([850.0, 700.0, 500.0]),
name="isobaric",
dims=["isobaric"],
attrs={"units": "hPa"},
),
'y': xarray.DataArray(
numpy.linspace(-1000, 500, 4),
name='y',
dims=['y'],
attrs={'units': 'km'}
"y": xarray.DataArray(
numpy.linspace(-1000, 500, 4), name="y", dims=["y"], attrs={"units": "km"}
),
'x': xarray.DataArray(
numpy.linspace(0, 1500, 4),
name='x',
dims=['x'],
attrs={'units': 'km'}
)
}
"x": xarray.DataArray(
numpy.linspace(0, 1500, 4), name="x", dims=["x"], attrs={"units": "km"}
),
},
)
ds['temperature'].attrs = {
'units': 'kelvin',
'grid_mapping': 'lambert_conformal'
}
ds['lambert_conformal'].attrs = {
'grid_mapping_name': 'lambert_conformal_conic',
'standard_parallel': 50.0,
'longitude_of_central_meridian': -107.0,
'latitude_of_projection_origin': 50.0,
'earth_shape': 'spherical',
'earth_radius': 6367470.21484375
ds["temperature"].attrs = {"units": "kelvin", "grid_mapping": "lambert_conformal"}
ds["lambert_conformal"].attrs = {
"grid_mapping_name": "lambert_conformal_conic",
"standard_parallel": 50.0,
"longitude_of_central_meridian": -107.0,
"latitude_of_projection_origin": 50.0,
"earth_shape": "spherical",
"earth_radius": 6367470.21484375,
}

return ds.metpy.parse_cf('temperature')
return ds.metpy.parse_cf("temperature")
Loading