Merge pull request #92 from IMMM-SFA/feature/update-dependencies

update dependencies, fix duplicate code in ipynb

.pre-commit-config.yaml

@@ -6,10 +6,10 @@
 
 repos:
 -   repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.5.1
+    rev: v0.5.5
     hooks:
         - id: ruff
-          args: [ --fix, --exit-non-zero-on-fix ]
+          args: [ --fix, --exit-non-zero-on-fix]
           exclude: .rst
 -   repo: https://github.com/psf/black
     rev: 24.4.2

notebooks/basin_users_logistic_regression.ipynb

@@ -30,19 +30,6 @@
     "In this tutorial, we will be loading in data that has been produced in Hadjimichael et al. (2020). Before we start our analysis, we'll load the relevant Python libraries, example data, and information for the three users."
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "##### **NOTE:**  If you are running this notebook locally, run the following command to install the required package data:\n",
-    "\n",
-    "```python\n",
-    "msdbook.install_package_data()\n",
-    "```\n",
-    "\n",
-    "##### Otherwise, proceed with the following"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": 1,
@@ -58,7 +45,6 @@
    "outputs": [],
    "source": [
     "#import libraries \n",
-    "# import msdbook\n",
     "import numpy as np\n",
     "import pandas as pd\n",
     "import matplotlib as mpl\n",

pyproject.toml

@@ -7,7 +7,7 @@ name = "msdbook"
 version = "0.1.5"
 description = "Jupyter notebook support for the MSD uncertainty ebook."
 readme = "README.md"
-requires-python = ">=3.6, <4"
+requires-python = ">=3.9, <4"
 keywords = ["uncertainty characterization", "MSD", "MultiSector Dynamics"]
 authors = [
   { name="Chris R. Vernon", email="chris.vernon@pnnl.gov" },
@@ -18,25 +18,24 @@ classifiers = [
   "License :: OSI Approved :: BSD License",
   "Operating System :: OS Independent",
   "Programming Language :: Python",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
 ]
 
 dependencies = [
-    "numpy>=1.21.1,<2",
+    "hmmlearn>=0.3.2",
     "importlib>=1.0.4",
-    "scipy>=1.8.1",
-    "SALib>=1.4.4",
-    "statsmodels>=0.12.2",
-    "pandas>=1.3.1",
-    "matplotlib>=3.4.2",
-    "seaborn>=0.11.2",
-    "requests>=2.25.1",
-    "scikit-learn>=0.24.2",
-    "hmmlearn==0.2.7",
+    "matplotlib>=3.9.1",
+    "numpy<2",
+    "pandas>=2.2.2",
+    "requests>=2.32.3",
+    "SALib>=1.4.7",
+    "scikit-learn>=1.5.1",
+    "scipy>=1.13.1",
+    "seaborn>=0.13.2",
+    "statsmodels>=0.14.2",
 ]
 
 [project.optional-dependencies]