update tox

.github/workflows/tests.yml

@@ -28,10 +28,12 @@ jobs:
 
       - name: Install dependencies
         run: |
+          make install-dev
           make install-test
       - name: Run tox
         run: |
           make tox
       - name: Run lint
         run: |
           make lint
+          make lint-notebooks

Makefile

@@ -14,14 +14,13 @@ lint:
 	@echo "Running linting..."
 	@$(BLACK) denseclus tests setup.py
 	@$(RUFF) denseclus tests setup.py --fix --preview
-	@$(PYLINT) denseclus
+	@$(PYLINT) denseclus --disable=R0902,W0222,W0221,C0103
 
 lint-notebooks:
 	@echo "Linting notebooks..."
 	@nbqa black notebooks/*.ipynb
 	@nbqa isort notebooks/*.ipynb
 	nbstripout notebooks/*.ipynb
-	@nbqa pylint notebooks/*.ipynb
 
 
 test:
@@ -46,7 +45,6 @@ install:
 install-dev: install
 	@echo "Installing dev dependencies..."
 	@$(PIP) install -r requirements-dev.txt
-	@$(PIP) pip install -e ".[dev]"
 
 install-test: install
 	@echo "Installing test dependencies..."

environment.yaml

@@ -3,7 +3,7 @@ channels:
   - defaults
   - conda-forge
 dependencies:
-  - python>=3.7
+  - python>=3.10
   - pip
   - numpy
   - scipy

setup.py

@@ -1,12 +1,7 @@
 #!/usr/bin/env/python3
 import setuptools
-from denseclus import __version__ as current_version
-
 import os
 
-print(os.environ["PYTHONPATH"])
-
-
 with open("README.md", encoding="utf-8") as fh:
     long_description = fh.read()
 
@@ -15,7 +10,7 @@
 
 setuptools.setup(
     name="Amazon DenseClus",
-    version=current_version,
+    version="0.1.0",
     author="Charles Frenzel & Baichuan Sun",
     description="Dense Clustering for Mixed Data Types",
     long_description=long_description,

tox.ini

@@ -10,12 +10,13 @@ src_dir =
 [tox]
 isolated_build = True
 minversion = 3.15
-envlist = py311
+envlist = py310
 
 
 [testenv]
 deps =
     pytest
+    pytest-cov
     ruff
     black
     coverage
@@ -31,10 +32,10 @@ passenv =
 extras =
     testing
 commands =
-    pytest {posargs}
+    pytest --cov=src --cov-report=term-missing {posargs}
     black denseclus
     ruff denseclus --fix --preview
-    pylint --fail-under=7 denseclus
+    pylint --fail-under=7 denseclus --disable=R0902,W0222,W0221,C0103
     mypy denseclus
     coverage erase
     coverage run --include=denseclus/* -m pytest -ra
@@ -136,4 +137,4 @@ commands =
 
 [gh-actions]
 python =
-    3.7: py37
+    3.10: py310