Merge branch 'main' into iv_weak_instruments

Signed-off-by: Nathaniel <NathanielF@users.noreply.github.com>

Author: NathanielF

.github/workflows/ci.yml

@@ -21,14 +21,12 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Update pip and setuptools
         run: pip install --upgrade pip setuptools
+      - name: Setup environment
+        run: pip install -e .[test]
       - name: Run doctests
-        run: |
-          pip install -e .[test]
-          pytest --doctest-modules --ignore=causalpy/tests/ causalpy/
+        run: pytest --doctest-modules --ignore=causalpy/tests/ causalpy/
       - name: Run tests
-        run: |
-          pip install -e .[test]
-          pytest --cov-report=xml --no-cov-on-fail
+        run: pytest --cov-report=xml --no-cov-on-fail
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4
         with:

.pre-commit-config.yaml

@@ -25,15 +25,15 @@ repos:
         exclude: &exclude_pattern 'iv_weak_instruments.ipynb'
         args: ["--maxkb=1500"]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.7
+    rev: v0.4.8
     hooks:
+      # Run the linter
       - id: ruff
-        args: ["--fix", "--output-format=full"]
+        types_or: [ python, pyi, jupyter ]
+        args: [ --fix ]
+      # Run the formatter
       - id: ruff-format
-  - repo: https://github.com/nbQA-dev/nbQA
-    rev: 1.8.5
-    hooks:
-      - id: nbqa-ruff
+        types_or: [ python, pyi, jupyter ]
   - repo: https://github.com/econchick/interrogate
     rev: 1.7.0
     hooks:

Makefile

@@ -10,8 +10,6 @@ lint:
 check_lint:
 	ruff check .
 	ruff format --diff --check .
-	nbqa black --check .
-	nbqa ruff .
 	interrogate .
 
 doctest:

docs/source/notebooks/did_pymc_banks.ipynb

@@ -57,7 +57,8 @@
     "    # rename to meaningful variables\n",
     "    .rename(columns={\"bib6\": \"Sixth District\", \"bib8\": \"Eighth District\"})\n",
     "    # reduce from daily resolution to examine median banks open by year\n",
-    "    .groupby(\"year\").median()\n",
+    "    .groupby(\"year\")\n",
+    "    .median()\n",
     ")\n",
     "\n",
     "treatment_time = 1930.5\n",

docs/source/notebooks/did_skl.ipynb

@@ -61,7 +61,7 @@
     }
    ],
    "source": [
-    "fig, ax = result.plot();"
+    "fig, ax = result.plot()"
    ]
   },
   {

docs/source/notebooks/generate_plots.ipynb

@@ -491,7 +491,7 @@
     }
    ],
    "source": [
-    "fig, ax = result.plot();"
+    "fig, ax = result.plot()"
    ]
   },
   {
@@ -1000,7 +1000,7 @@
     }
    ],
    "source": [
-    "fig, ax = result.plot();"
+    "fig, ax = result.plot()"
    ]
   },
   {

docs/source/notebooks/its_skl.ipynb

@@ -204,7 +204,7 @@
     }
    ],
    "source": [
-    "fig, ax = result.plot();"
+    "fig, ax = result.plot()"
    ]
   },
   {

docs/source/notebooks/rd_pymc_drinking.ipynb

@@ -199,7 +199,7 @@
     }
    ],
    "source": [
-    "fig, ax = result.plot();"
+    "fig, ax = result.plot()"
    ]
   },
   {
@@ -413,7 +413,7 @@
     "    treatment_threshold=21,\n",
     ")\n",
     "\n",
-    "fig, ax = result2.plot();"
+    "fig, ax = result2.plot()"
    ]
   },
   {

docs/source/notebooks/rd_skl.ipynb

@@ -172,7 +172,7 @@
     }
    ],
    "source": [
-    "fig, ax = result.plot();"
+    "fig, ax = result.plot()"
    ]
   },
   {
@@ -354,7 +354,7 @@
     }
    ],
    "source": [
-    "fig, ax = result.plot();"
+    "fig, ax = result.plot()"
    ]
   },
   {