[pre-commit.ci] pre-commit autoupdate (#216)

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/psf/black: 21.12b0 → 22.1.0](psf/black@21.12b0...22.1.0)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Fabian Hofmann <hofmann@fias.uni-frankfurt.de>

Author: pre-commit-ci[bot]

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
     hooks:
     -   id: check-yaml
 -   repo: https://github.com/psf/black
-    rev: 21.12b0
+    rev: 22.1.0
     hooks:
     -   id: black
 -   repo: https://github.com/fsfe/reuse-tool

atlite/convert.py

@@ -266,7 +266,7 @@ def convert_coefficient_of_performance(ds, source, sink_T, c0, c1, c2):
 
     delta_T = sink_T - source_T
 
-    return c0 + c1 * delta_T + c2 * delta_T ** 2
+    return c0 + c1 * delta_T + c2 * delta_T**2
 
 
 def coefficient_of_performance(
@@ -869,11 +869,11 @@ def convert_line_rating(
 
     # 1. Convective Loss, at first forced convection
     V = ds["wnd100m"]  # typically ironmen are about 40-60 meters high
-    mu = (1.458e-6 * Tfilm ** 1.5) / (
+    mu = (1.458e-6 * Tfilm**1.5) / (
         Tfilm + 383.4 - T0
     )  # Dynamic viscosity of air (13a)
     H = ds["height"]
-    rho = (1.293 - 1.525e-4 * H + 6.379e-9 * H ** 2) / (
+    rho = (1.293 - 1.525e-4 * H + 6.379e-9 * H**2) / (
         1 + 0.00367 * (Tfilm - T0)
     )  # (14a)
 
@@ -889,13 +889,13 @@ def convert_line_rating(
     )  # wind direction factor
 
     Tdiff = Ts - Ta
-    qcf1 = K * (1.01 + 1.347 * reynold ** 0.52) * k * Tdiff  # (3a) in [1]
-    qcf2 = K * 0.754 * reynold ** 0.6 * k * Tdiff  # (3b) in [1]
+    qcf1 = K * (1.01 + 1.347 * reynold**0.52) * k * Tdiff  # (3a) in [1]
+    qcf2 = K * 0.754 * reynold**0.6 * k * Tdiff  # (3b) in [1]
 
     qcf = np.maximum(qcf1, qcf2)
 
     #  natural convection
-    qcn = 3.645 * np.sqrt(rho) * D ** 0.75 * Tdiff ** 1.25
+    qcn = 3.645 * np.sqrt(rho) * D**0.75 * Tdiff**1.25
 
     # convection loss is the max between forced and natural
     qc = np.maximum(qcf, qcn)

atlite/pv/solar_panel_model.py

@@ -35,8 +35,8 @@ def _power_huld(irradiance, t_amb, pc):
         1
         + pc["k_1"] * log_G_
         + pc["k_2"] * (log_G_) ** 2
-        + T_ * (pc["k_3"] + pc["k_4"] * log_G_ + pc["k_5"] * log_G_ ** 2)
-        + pc["k_6"] * (T_ ** 2)
+        + T_ * (pc["k_3"] + pc["k_4"] * log_G_ + pc["k_5"] * log_G_**2)
+        + pc["k_6"] * (T_**2)
     )
 
     eff = eff.fillna(0.0).clip(min=0)

doc/conf.py

@@ -66,10 +66,10 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"atlite"
-author = u"The Atlite Authors"
-copyright = u"2016-2019" + u", " + author
-documentation_title = u"Atlite Documentation"
+project = "atlite"
+author = "The Atlite Authors"
+copyright = "2016-2019" + ", " + author
+documentation_title = "Atlite Documentation"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -269,14 +269,14 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
-latex_documents = [(master_doc, "atlite.tex", documentation_title, author, u"manual")]
+latex_documents = [(master_doc, "atlite.tex", documentation_title, author, "manual")]
 
 
 # Added for rinoh http://www.mos6581.org/rinohtype/quickstart.html
 rinoh_documents = [
     (
         master_doc,  # top-level file (index.rst)
-        project + u".pdf",  # output (target.pdf)
+        project + ".pdf",  # output (target.pdf)
         documentation_title,  # document title
         author,
     )

test/test_gis.py

@@ -314,7 +314,7 @@ def test_shape_availability_area(ref):
 
     shapes = shapes.to_crs(3035)
     masked, transform = shape_availability(shapes, excluder)
-    assert np.isclose(shapes.area, masked.sum() * res ** 2)
+    assert np.isclose(shapes.area, masked.sum() * res**2)
 
 
 def test_exclusioncontainer_geometries():
@@ -354,13 +354,13 @@ def test_shape_availability_exclude_geometry(ref):
     excluder.add_geometry(exclude)
     masked, transform = shape_availability(shapes, excluder)
     area = shapes.geometry[0].area  # get area without warning
-    assert isclose(3 * area / 4, masked.sum() * res ** 2)
+    assert isclose(3 * area / 4, masked.sum() * res**2)
 
     excluder = ExclusionContainer(ref.crs, res=res)
     excluder.add_geometry(exclude, invert=True)
     masked, transform = shape_availability(shapes, excluder)
     area = shapes.geometry[0].area  # get area without warning
-    assert isclose(area / 4, masked.sum() * res ** 2)
+    assert isclose(area / 4, masked.sum() * res**2)
 
 
 def test_shape_availability_exclude_raster(ref, raster):
@@ -408,17 +408,17 @@ def test_shape_availability_excluder_partial_overlap(ref, raster):
     excluder = ExclusionContainer(ref.crs, res=res)
     excluder.add_raster(raster, codes=[0, 1])
     masked, transform = shape_availability(shapes, excluder)
-    assert masked.sum() * (res ** 2) == area / 2
+    assert masked.sum() * (res**2) == area / 2
 
     excluder = ExclusionContainer(ref.crs, res=res)
     excluder.add_raster(raster, nodata=0)
     masked, transform = shape_availability(shapes, excluder)
-    assert masked.sum() * (res ** 2) > area / 2
+    assert masked.sum() * (res**2) > area / 2
 
     excluder = ExclusionContainer(ref.crs, res=res)
     excluder.add_raster(raster, nodata=1)
     masked, transform = shape_availability(shapes, excluder)
-    assert masked.sum() * (res ** 2) < area / 2
+    assert masked.sum() * (res**2) < area / 2
 
 
 def test_shape_availability_excluder_raster_no_overlap(ref, raster):
@@ -441,12 +441,12 @@ def test_shape_availability_excluder_raster_no_overlap(ref, raster):
     excluder = ExclusionContainer(ref.crs, res=res)
     excluder.add_raster(raster, allow_no_overlap=True, codes=[1, 255], invert=True)
     masked, transform = shape_availability(shapes, excluder)
-    assert masked.sum() * (res ** 2) == area
+    assert masked.sum() * (res**2) == area
 
     excluder = ExclusionContainer(ref.crs, res=res)
     excluder.add_raster(raster, allow_no_overlap=True, nodata=0)
     masked, transform = shape_availability(shapes, excluder)
-    assert masked.sum() * (res ** 2) == area
+    assert masked.sum() * (res**2) == area
 
 
 def test_availability_matrix_rastered(ref, raster):

test/test_preparation_and_conversion.py

@@ -208,7 +208,7 @@ def wind_test(cutout):
     assert production.sum() > 0
 
     # Now create a better layout with same amount of installed power
-    better_layout = (cap_factor ** 2) / (cap_factor ** 2).sum() * cap_factor.sum()
+    better_layout = (cap_factor**2) / (cap_factor**2).sum() * cap_factor.sum()
     better_production = cutout.wind(
         atlite.windturbines.Enercon_E101_3000kW, layout=better_layout
     )