Merge pull request #66 from capitalone/dev

Release v2023.6.1

.github/workflows/test-package.yml

@@ -17,10 +17,10 @@ jobs:
             matrix:
                 os: [ubuntu-latest, windows-latest]
                 python-version:
-                    - 3.7
                     - 3.8
                     - 3.9
                     - "3.10"
+                    - "3.11"
         steps:
             - uses: actions/checkout@v2
             - name: Set up Python ${{ matrix.python-version }}

README.md

@@ -41,7 +41,7 @@ Table Of Contents
 Install
 -------
 
-Create a ``conda`` environment with Python 3.7+ and install from PyPI:
+Create a ``conda`` environment with Python 3.8+ and install from PyPI:
 
 ```console
 $ python -m pip install edgetest

docs/source/conf.py

@@ -25,7 +25,7 @@
 author = "Akshay Gupta"
 
 # The short X.Y version
-version = "2023.6.0"
+version = "2023.6.1"
 # The full version, including alpha/beta/rc tags
 release = ""
 

edgetest/__init__.py

@@ -1,7 +1,7 @@
 """Package initialization."""
 
 
-__version__ = "2023.6.0"
+__version__ = "2023.6.1"
 
 __title__ = "edgetest"
 __description__ = "Bleeding edge dependency testing"

edgetest/core.py

@@ -9,7 +9,7 @@
 from pluggy._hooks import _HookRelay
 
 from .logger import get_logger
-from .utils import _run_command, pushd
+from .utils import _isin_case_dashhyphen_ins, _run_command, pushd
 
 LOG = get_logger(__name__)
 
@@ -149,7 +149,11 @@ def upgraded_packages(self) -> List[Dict[str, str]]:
         outjson = json.loads(out)
 
         upgrade_wo_extras = [pkg.split("[")[0] for pkg in self.upgrade]
-        return [pkg for pkg in outjson if pkg.get("name", "") in upgrade_wo_extras]
+        return [
+            pkg
+            for pkg in outjson
+            if _isin_case_dashhyphen_ins(pkg.get("name", ""), upgrade_wo_extras)
+        ]
 
     def run_tests(self, command: str) -> int:
         """Run the tests in the package directory.

edgetest/utils.py

@@ -479,3 +479,24 @@ def upgrade_pyproject_toml(
             parser["project"]["optional-dependencies"][extra] = upgraded.split("\n")  # type: ignore
 
     return parser
+
+
+def _isin_case_dashhyphen_ins(a: str, vals: List[str]) -> bool:
+    """Run isin check that is case and dash/hyphen insensitive.
+
+    Paramaters
+    ----------
+    a : str
+        String value to check for membership against ``vals``.
+    vals : list of str
+        List of strings to check ``a`` against.
+
+    Returns
+    -------
+    bool
+        Return ``True`` if ``a`` in vals, otherwise ``False``.
+    """
+    for b in vals:
+        if a.replace("_", "-").lower() == b.replace("_", "-").lower():
+            return True
+    return False

setup.cfg

@@ -11,7 +11,7 @@ maintainer = Akshay Gupta
 maintainer_email = [email protected]
 url = https://github.com/capitalone/edgetest
 python_requires =
-	>=3.7.0
+	>=3.8.0
 project_urls =
 	Documentation = https://capitalone.github.io/edgetest/
 	Bug Tracker = https://github.com/capitalone/edgetest/issues
@@ -23,10 +23,10 @@ classifiers =
 	Programming Language :: Python
 	Programming Language :: Python :: 3
 	Programming Language :: Python :: 3 :: Only
-	Programming Language :: Python :: 3.7
 	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
+	Programming Language :: Python :: 3.11
 
 [options]
 zip_safe = False
@@ -100,7 +100,7 @@ console_scripts =
 	edgetest = edgetest.interface:cli
 
 [bumpver]
-current_version = "2023.6.0"
+current_version = "2023.6.1"
 version_pattern = "YYYY.MM.INC0"
 commit_message = "Bump {old_version} to {new_version}"
 commit = True

tests/test_integration_cfg.py

@@ -46,7 +46,7 @@
 include_package_data = True
 packages = find:
 install_requires =
-    click<=8.0.0,>=7.1
+    scikit-learn>=1.0,<=1.2.0
     dask[dataframe]<=2022.1.0
 
 [options.extras_require]
@@ -57,8 +57,8 @@
 extras =
     tests
 upgrade =
-    click
-    dask[dataframe]
+    Scikit_Learn
+    Dask[DataFrame]
 """
 
 
@@ -109,6 +109,7 @@ def test_toy_package():
         assert result.exit_code == 0
         assert Path(loc, ".edgetest").is_dir()
         assert Path(loc, ".edgetest", "pandas").is_dir()
+        assert "pandas" in result.stdout
 
         if not sys.platform == "win32":
             assert Path(
@@ -150,13 +151,15 @@ def test_toy_package_dask():
                 loc, ".edgetest", "core", "lib", PY_VER, "site-packages", "pandas"
             ).is_dir()
             assert Path(
-                loc, ".edgetest", "core", "lib", PY_VER, "site-packages", "click"
+                loc, ".edgetest", "core", "lib", PY_VER, "site-packages", "sklearn"
             ).is_dir()
 
         config = configparser.ConfigParser()
         config.read("setup.cfg")
 
-        assert "click" in config["options"]["install_requires"]
+        assert "scikit-learn" in config["options"]["install_requires"]
         assert "dask[dataframe]" in config["options"]["install_requires"]
         assert config["edgetest.envs.core"]["extras"] == "\ntests"
-        assert config["edgetest.envs.core"]["upgrade"] == "\nclick\ndask[dataframe]"
+        assert config["edgetest.envs.core"]["upgrade"] == "\nScikit_Learn\nDask[DataFrame]"
+        assert "dask" in result.stdout
+        assert "scikit-learn" in result.stdout

tests/test_integration_toml.py

@@ -31,14 +31,14 @@
 version = "0.1.0"
 description = "Fake description"
 requires-python = ">=3.7.0"
-dependencies = ["click<=8.0.0,>=7.1", "dask[dataframe]<=2022.1.0"]
+dependencies = ["Scikit_Learn>=1.0,<=1.2.0", "Dask[dataframe]<=2022.1.0"]
 
 [project.optional-dependencies]
 tests = ["pytest"]
 
 [edgetest.envs.core]
 extras = ["tests"]
-upgrade = ["click", "dask[dataframe]"]
+upgrade = ["scikit-learn", "dask[dataframe]"]
 """
 
 
@@ -89,6 +89,7 @@ def test_toy_package():
         assert result.exit_code == 0
         assert Path(loc, ".edgetest").is_dir()
         assert Path(loc, ".edgetest", "pandas").is_dir()
+        assert "pandas" in result.stdout
 
         if not sys.platform == "win32":
             assert Path(
@@ -130,15 +131,17 @@ def test_toy_package_dask():
                 loc, ".edgetest", "core", "lib", PY_VER, "site-packages", "pandas"
             ).is_dir()
             assert Path(
-                loc, ".edgetest", "core", "lib", PY_VER, "site-packages", "click"
+                loc, ".edgetest", "core", "lib", PY_VER, "site-packages", "sklearn"
             ).is_dir()
 
         config = load(open("pyproject.toml"))
 
-        assert "click" in config["project"]["dependencies"][0]
-        assert "dask" in config["project"]["dependencies"][1]
+        assert "Scikit_Learn" in config["project"]["dependencies"][0]
+        assert "Dask" in config["project"]["dependencies"][1]
         assert config["edgetest"]["envs"]["core"]["extras"] == ["tests"]
         assert config["edgetest"]["envs"]["core"]["upgrade"] == [
-            "click",
+            "scikit-learn",
             "dask[dataframe]",
         ]
+        assert "dask" in result.stdout
+        assert "scikit-learn" in result.stdout

tests/test_utils.py

@@ -13,6 +13,7 @@
     parse_toml,
     upgrade_pyproject_toml,
     upgrade_setup_cfg,
+    _isin_case_dashhyphen_ins,
 )
 
 REQS = """
@@ -481,3 +482,15 @@ def test_upgrade_pyproject_toml(tmpdir):
             "optional-dependencies": {"tests": ["pytest<=4.0.0,>=1.0.0"]},
         }
     }
+
+
+def test_isin_case_dashhyphen_ins():
+    vals = ["pandas", "python-dateutil"]
+
+    assert _isin_case_dashhyphen_ins("pandas", vals)
+    assert _isin_case_dashhyphen_ins("Pandas", vals)
+    assert not _isin_case_dashhyphen_ins("Panda$", vals)
+    assert _isin_case_dashhyphen_ins("python-dateutil", vals)
+    assert _isin_case_dashhyphen_ins("Python_Dateutil", vals)
+    assert not _isin_case_dashhyphen_ins("Python_Dateut1l", vals)
+    assert not _isin_case_dashhyphen_ins("pandaspython-dateutil", vals)