Merge pull request #33 from frank1010111/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.7.0
+    rev: 24.2.0
     hooks:
       - id: black-jupyter
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.5.0
     hooks:
       - id: check-added-large-files
         args: ["--maxkb=20000"]
@@ -23,7 +23,7 @@ repos:
         args: [--markdown-linebreak-ext=md]
 
   - repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.9.0
+    rev: v1.10.0
     hooks:
       - id: python-check-blanket-noqa
       - id: python-check-blanket-type-ignore
@@ -34,20 +34,20 @@ repos:
       - id: rst-inline-touching-normal
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v2.6.2"
+    rev: "v4.0.0-alpha.8"
     hooks:
       - id: prettier
         types_or: [yaml, markdown, html, css, scss, javascript, json]
         args: [--prose-wrap=always]
 
   - repo: https://github.com/asottile/blacken-docs
-    rev: v1.12.1
+    rev: 1.16.0
     hooks:
       - id: blacken-docs
         additional_dependencies: [black==23.7.0]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.0.246"
+    rev: "v0.3.2"
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]
@@ -63,12 +63,12 @@ repos:
   #         - scipy
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.5
+    rev: v2.2.6
     hooks:
       - id: codespell
 
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.8.0.4
+    rev: v0.9.0.6
     hooks:
       - id: shellcheck
 
@@ -81,7 +81,7 @@ repos:
         exclude: .pre-commit-config.yaml
 
   - repo: https://github.com/mgedmin/check-manifest
-    rev: "0.48"
+    rev: "0.49"
     hooks:
       - id: check-manifest
         stages: [manual]

docs/index.md

@@ -31,7 +31,7 @@ have been used to make forecasts from the individual well level up to the basin
 and play level, depending on the availability of fluid property and bottomhole
 pressure data.
 
-Compare to the most common unconventional production analysis tool. Emprical
+Compare to the most common unconventional production analysis tool. Empirical
 decline curve analysis (DCA) provides very fast answers, but lack physical
 meaning. Bluebonnet fits include estimates of the resource within the drainage
 volume and of permeability divided by interfracture spacing. A completion

noxfile.py

@@ -1,4 +1,5 @@
 """Nox sessions for linting, docs, and testing."""
+
 from __future__ import annotations
 
 import argparse

pyproject.toml

@@ -86,6 +86,10 @@ addopts = [
 testpaths = ["tests"]
 
 [tool.ruff]
+line-length = 99
+target-version = "py37"
+
+[tool.ruff.lint]
 select = [
   "E",
   "F",
@@ -115,8 +119,6 @@ extend-ignore = [
   "PT004",  # Use underscore for non-returning fixture (use usefixture instead)
   "RET504", # 'unnecessary' variable assignment before return statement
 ]
-line-length = 99
-target-version = "py37"
 unfixable = [
   "T20",  # Removes print statements
   "F841", # Removes unused variables
@@ -125,7 +127,7 @@ exclude = []
 flake8-unused-arguments.ignore-variadic-names = true
 isort.required-imports = ["from __future__ import annotations"]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
 "noxfile.py" = ["T", "T201"]
 "tests/**.py" = ["D101", "D102", "D103"]

src/bluebonnet/flow/__init__.py

@@ -1,4 +1,5 @@
 """Flow, pressure changes, and production from hydraulically fractured reservoirs."""
+
 from __future__ import annotations
 
 from bluebonnet.flow.flowproperties import (

src/bluebonnet/flow/flowproperties.py

@@ -4,6 +4,7 @@
 module includes structures for storing these pressure-dependent properties
 in order to aid the reservoir simulators in the `reservoir` module.
 """
+
 from __future__ import annotations
 
 import copy
@@ -80,7 +81,9 @@ def __init__(self, pvt_props: Mapping[str, ndarray], p_i: float):
                 pvt_props["pressure"], 1 / pvt_props["pseudopressure"]
             )
             warnings.warn(
-                "warning: scaling pseudopressure, using user's hydraulic diffusivity"
+                "warning: scaling pseudopressure, using user's hydraulic diffusivity",
+                RuntimeWarning,
+                stacklevel=2,
             )
             m_scaling_factor = m_scale_func(p_i)
         else:

src/bluebonnet/fluids/__init__.py

@@ -4,6 +4,7 @@
 Uses common empirical correlations to get properties. These include density,
 saturation pressure, viscosity, and the pseudopressure transform.
 """
+
 from __future__ import annotations
 
 from bluebonnet.fluids.fluid import Fluid, build_pvt_gas, pseudopressure

src/bluebonnet/fluids/gas.py

@@ -1,4 +1,5 @@
 """Gas pvt properties, using Dranchuk and Abou-Kassem's correlations."""
+
 from __future__ import annotations
 
 import math
@@ -165,7 +166,7 @@ def z_factor_hallyarbrough(pressure: float, temperature: float) -> float:
     References
     ----------
     `Hall-Yarbrough estimation <https://wiki.whitson.com/eos/eos_models/zfactor/index.html#hall-yarbrough-estimation-of-gas-z-factor>`_
-    """  # noqa: E501
+    """
     t = 1 / temperature
     y = 0.001
     fdum = 1

src/bluebonnet/fluids/water.py

@@ -1,4 +1,5 @@
 """PVT and viscosity for water from the correlations provided by McCain."""
+
 from __future__ import annotations
 
 import numpy as np
@@ -150,12 +151,7 @@ def viscosity_water_McCain(
     >>> viscosity_water_McCain(400, 3000, 15)
     0.2627774655403418
     """
-    A = (
-        109.574
-        - 8.40564 * salinity
-        + 0.313314 * salinity**2
-        + 8.72213e-3 * salinity**3
-    )
+    A = 109.574 - 8.40564 * salinity + 0.313314 * salinity**2 + 8.72213e-3 * salinity**3
     B = (
         1.12166
         - 2.63951e-2 * salinity
@@ -164,8 +160,6 @@ def viscosity_water_McCain(
         - 1.55586e-6 * salinity**4
     )
     mu_water = (
-        A
-        * temperature**-B
-        * (0.9994 + 4.0295e-5 * pressure + 3.1062e-9 * pressure**2)
+        A * temperature**-B * (0.9994 + 4.0295e-5 * pressure + 3.1062e-9 * pressure**2)
     )
     return mu_water

src/bluebonnet/forecast/forecast.py

@@ -1,4 +1,5 @@
 """Fit and forecast production from hydrofractured reservoirs."""
+
 from __future__ import annotations
 
 from collections.abc import Callable

src/bluebonnet/forecast/forecast_pressure.py

@@ -1,4 +1,5 @@
 """Forecast when bottomhole/fracface pressure is known and varying."""
+
 from __future__ import annotations
 
 from typing import Any

src/bluebonnet/plotting.py

@@ -1,4 +1,5 @@
 """Ease plotting production and fluid flow information."""
+
 from __future__ import annotations
 
 from typing import Any, Union
@@ -37,7 +38,7 @@ def set_default_locators_and_formatters(self, axis):
         axis.set_minor_locator(ticker.NullLocator())
         axis.set_minor_formatter(ticker.NullFormatter())
 
-    def limit_range_for_scale(self, vmin, vmax, minpos):  # noqa: ARG
+    def limit_range_for_scale(self, vmin, vmax, minpos):  # noqa: ARG002
         """Do not allow negative values."""
         return max(0.0, vmin), vmax
 

tests/flow/test_properties.py

@@ -1,4 +1,5 @@
 """Define a suite a tests for the flowproperties module."""
+
 from __future__ import annotations
 
 from copy import copy

tests/flow/test_reservoir.py

@@ -1,4 +1,5 @@
 """Define a suite a tests for the reservoir module."""
+
 from __future__ import annotations
 
 from itertools import product

tests/fluids/test_fluid.py

@@ -1,4 +1,5 @@
 """Define a suite a tests for the fluid module."""
+
 from __future__ import annotations
 
 import numpy as np

tests/fluids/test_gas.py

@@ -1,4 +1,5 @@
 """Define a suite a tests for the gas module."""
+
 from __future__ import annotations
 
 import numpy as np

tests/fluids/test_oil.py

@@ -1,4 +1,5 @@
 """Define a suite a tests for the oil module."""
+
 from __future__ import annotations
 
 import math

tests/fluids/test_water.py

@@ -1,4 +1,5 @@
 """Define a suite a tests for the gas module."""
+
 from __future__ import annotations
 
 import pytest

tests/forecast/test_forecast.py

@@ -1,4 +1,5 @@
 """Test fitting and forecasting production."""
+
 from __future__ import annotations
 
 import numpy as np

tests/test_bluebonnet.py

@@ -1,4 +1,5 @@
 """Smoke test that bluebonnet imports."""
+
 from __future__ import annotations
 
 import bluebonnet