remove pytest-virtualenv from test dependencies (incompatible with py…

…312), remove generate_classes tests (implicitly CI tested by generating classes from mf6 develop), add py312 classifier to pyproject.toml, add xmipy to etc/environment.yml (replace bmipy), minor simplifications to autotest/conftest.py

.docs/md/generate_classes.md

@@ -97,7 +97,3 @@ $ python -m flopy.mf6.utils.generate_classes --dfnpath ../your/dfn/path
 Branch names, commit hashes, or tags may be provided to `ref`.
 
 By default, a backup is made of FloPy's package classes before rewriting them. To disable backups, use `--no-backup` from command-line, or `backup=False` with the Python function.
-
-## Testing class generation
-
-Tests for the `generate_classes()` utility are located in `test_generate_classes.py`. The tests depend on [`pytest-virtualenv`](https://pypi.org/project/pytest-virtualenv/) and will be skipped if run in parallel without the `--dist loadfile` option for `pytest-xdist`.

.github/workflows/commit.yml

@@ -151,7 +151,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        python-version: [ 3.8, 3.9, "3.10", "3.11" ]
+        python-version: [ 3.8, 3.9, "3.10", "3.11", "3.12" ]
         exclude:
           # avoid shutil.copytree infinite recursion bug
           # https://github.com/python/cpython/pull/17098
@@ -193,13 +193,6 @@ jobs:
             bash
             powershell
 
-      - name: Install Python dependencies
-        shell: bash -l {0}
-        if: runner.os == 'Windows'
-        run: |
-          pip install xmipy
-          pip install .
-
       - name: Install Modflow-related executables
         uses: modflowpy/install-modflow-action@v1
 

autotest/conftest.py

@@ -1,18 +1,8 @@
-import importlib
-import os
 import re
-import socket
-import sys
 from importlib import metadata
-from os import environ
-from os.path import basename, normpath
 from pathlib import Path
 from platform import system
-from shutil import copytree, which
-from subprocess import PIPE, Popen
-from typing import List, Optional
-from urllib import request
-from warnings import warn
+from typing import List
 
 import matplotlib.pyplot as plt
 import pytest
@@ -28,7 +18,7 @@
 SHAPEFILE_EXTENSIONS = ["prj", "shx", "dbf"]
 
 
-# misc utilities
+# path utilities
 
 
 def get_project_root_path() -> Path:
@@ -43,7 +33,7 @@ def get_flopy_data_path() -> Path:
     return get_project_root_path() / "flopy" / "data"
 
 
-# path fixtures
+# fixtures
 
 
 @pytest.fixture(scope="session")
@@ -66,11 +56,9 @@ def example_shapefiles(example_data_path) -> List[Path]:
     return [f.resolve() for f in (example_data_path / "prj_test").glob("*")]
 
 
-# fixture to automatically close any plots (or optionally show them)
-
-
 @pytest.fixture(autouse=True)
 def close_plot(request):
+    # fixture to automatically close any plots (or optionally show them)
     yield
 
     # plots only shown if requested via CLI flag,
@@ -118,14 +106,6 @@ def pytest_addoption(parser):
         "but automated tests should probably also check patch collections or figure & axis properties.)",
     )
 
-    # for test_generate_classes.py
-    parser.addoption(
-        "--ref",
-        action="append",
-        type=str,
-        help="Include extra refs to test. Useful for testing branches on a fork, e.g. <your GitHub username>/modflow6/<your branch>.",
-    )
-
 
 def pytest_report_header(config):
     """Header for pytest to show versions of packages."""

etc/environment.yml

@@ -27,7 +27,6 @@ dependencies:
   - pytest-cases
   - pytest-cov
   - pytest-dotenv
-  - pytest-virtualenv
   - pytest-xdist
   - virtualenv
 
@@ -52,4 +51,4 @@ dependencies:
   - pymetis
 
   # MODFLOW API dependencies
-  - bmipy
+  - xmipy

pyproject.toml

@@ -55,7 +55,6 @@ test = [
     "pytest-cases",
     "pytest-cov",
     "pytest-dotenv",
-    "pytest-virtualenv",
     "pytest-xdist",
     "virtualenv"
 ]