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

[pre-commit.ci] pre-commit autoupdate

.github/workflows/tests.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.8", "3.11"]
+        python-version: ["3.8", "3.12"]
       fail-fast: false
     steps:
       - uses: actions/checkout@v3

.pre-commit-config.yaml

@@ -41,13 +41,13 @@ repos:
         args: [--prose-wrap=always]
 
   - repo: https://github.com/asottile/blacken-docs
-    rev: 1.16.0
+    rev: 1.18.0
     hooks:
       - id: blacken-docs
         additional_dependencies: [black==23.7.0]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.4.10"
+    rev: "v0.5.0"
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]

docs/bayesian_fitting.ipynb

@@ -29,7 +29,7 @@
    "source": [
     "import numpy as np\n",
     "from scipy.interpolate import interp1d, UnivariateSpline\n",
-    "from scipy.integrate import cumtrapz\n",
+    "from scipy.integrate import cumulative_trapezoid\n",
     "from scipy.misc import derivative\n",
     "import pandas as pd\n",
     "import matplotlib.pyplot as plt\n",
@@ -108,7 +108,7 @@
     "    1, 0.1, size=len(time_on_production)\n",
     ")\n",
     "time_on_production = time_on_production  # [1:]\n",
-    "cum_production = cumtrapz(production, time_on_production, initial=0)\n",
+    "cum_production = cumulative_trapezoid(production, time_on_production, initial=0)\n",
     "\n",
     "fig, ax = plt.subplots()\n",
     "ax.plot(time_on_production, production, color=\"peru\", label=\"Rate\")\n",

docs/forecast.ipynb

@@ -22,7 +22,7 @@
    "source": [
     "import numpy as np\n",
     "from scipy.interpolate import interp1d\n",
-    "from scipy.integrate import cumtrapz\n",
+    "from scipy.integrate import cumulative_trapezoid\n",
     "from scipy.misc import derivative\n",
     "import pandas as pd\n",
     "import matplotlib.pyplot as plt\n",
@@ -104,7 +104,7 @@
     ") / np.sqrt(time_on_production + 0.1)\n",
     "fake_rf = rf_func(time_on_production / fake_tau)\n",
     "fake_rate = m_factor * np.maximum(np.gradient(fake_rf) + randomness, 0)\n",
-    "cum_production = cumtrapz(fake_rate, time_on_production, initial=0)\n",
+    "cum_production = cumulative_trapezoid(fake_rate, time_on_production, initial=0)\n",
     "\n",
     "fig, ax = plt.subplots()\n",
     "ax.plot(time_on_production, fake_rate, color=\"peru\", label=\"Rate\")\n",

pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
   "Topic :: Scientific/Engineering",
 ]
 readme = "README.md"
-requires-python = ">=3.8,<3.12"
+requires-python = ">=3.8,<3.13"
 dependencies = [
   "lmfit >=1.0",
   "numpy >=1.22",

src/bluebonnet/fluids/fluid.py

@@ -9,7 +9,7 @@
 import pandas as pd
 import scipy as sp
 from numpy.typing import NDArray
-from scipy.integrate import cumtrapz
+from scipy.integrate import cumulative_trapezoid
 
 from bluebonnet.fluids.gas import (
     b_factor_DAK,
@@ -106,7 +106,7 @@ def build_pvt_gas(
             "viscosity": viscosity,
         }
     )
-    pseudopressure = 2 * cumtrapz(
+    pseudopressure = 2 * cumulative_trapezoid(
         pvt_gas["pressure"] / (pvt_gas["viscosity"] * pvt_gas["z-factor"]),
         pvt_gas["pressure"],
         initial=0.0,

tests/fluids/test_fluid.py

@@ -90,7 +90,8 @@ def test_bg(gas_properties):
     elif gas_properties.fluid == "wet gas":
         real_fvf = pytest.approx(0.000813928, rel=1e-3)
     else:
-        ValueError("gas_properties.fluid must be one of 'wet gas' or 'dry gas'")
+        msg = "gas_properties.fluid must be one of 'wet gas' or 'dry gas'"
+        raise ValueError(msg)
     fluid_instance = Fluid(
         temperature=gas_properties.temperature,
         api_gravity=10,
@@ -112,7 +113,8 @@ def test_mu_g(gas_properties):
     elif gas_properties.fluid == "wet gas":
         real_mu = pytest.approx(0.023553396, rel=1e-3)
     else:
-        ValueError("gas_properties.fluid must be one of 'wet gas' or 'dry gas'")
+        msg = "haven't studied this pressure yet"
+        raise ValueError(msg)
     fluid_instance = Fluid(
         temperature=gas_properties.temperature,
         api_gravity=10,