Merge pull request #100 from mrf345/testing

Drop support for python 3.7, add 3.13, and replace `make` with `nox`

Author: mrf345

.github/workflows/ci.yml

@@ -10,8 +10,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-latest]
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
+        os: [ubuntu-latest, windows-latest]
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
       - uses: actions/checkout@v4

Makefile

@@ -147,10 +147,11 @@ the **default** parsers are set to `{"html": Html, "script": Jsmin, "style": Rcs
 
 
 ## Development:
+Make sure you have [nox](https://nox.thea.codes/en/stable/) installed.
 
-- *Tests*: `make test`
-- *Style check*: `make lint`
-- *Format code*: `make format`
+- *Tests*: `nox -s test`
+- *Style check*: `nox -s lint`
+- *Format code*: `nox -s format`
 
 ## Breaking changes
 

README.md

@@ -1,3 +1,4 @@
 exclude_dirs:
     - 'tests'
     - '.venv'
+    - '.nox'

bandit.yml

@@ -1,5 +1,6 @@
-__version__ = "0.48"
+__version__ = "0.49"
 __doc__ = "Flask extension to minify html, css, js and less."
 __license__ = "MIT"
 __author__ = "Mohamed Feddad"
 __email__ = "mrf345@gmail.com"
+__supported_versions__ = ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]

flask_minify/about.py

@@ -8,7 +8,7 @@
 
 try:
     import minify as minify_go
-except ImportError:
+except Exception:
     minify_go = None
 
 from flask_minify.exceptions import FlaskMinifyException

flask_minify/parsers.py

@@ -0,0 +1,62 @@
+import os
+
+import nox
+
+nox.options.sessions = ["lint", "test"]
+
+basedir = os.path.abspath(os.path.dirname(__file__))
+about_path = os.path.join(basedir, os.path.join("flask_minify", "about.py"))
+about_content = ""
+test_req_path = os.path.join("requirements", "test.txt")
+dev_req_path = os.path.join("requirements", "dev.txt")
+
+with open(about_path) as f:
+    about_content = f.read()
+    exec(about_content)  # nosec
+
+
+@nox.session(python=__supported_versions__)  # type: ignore
+def test(session: nox.session):
+    session.install("-r", test_req_path)
+    session.run("python", "-m", "pytest")
+    session.run("python", "-m", "bandit", "-c", "bandit.yml", "-r", ".")
+
+
+@nox.session
+def lint(session: nox.Session):
+    session.install("-r", test_req_path)
+    session.run(
+        "python", "-m", "isort", "-sg", "**/.nox*", "--profile", "black", "--check", "."
+    )
+    session.run("python", "-m", "black", "--check", ".")
+
+
+@nox.session
+def format(session: nox.Session):
+    session.install("-r", test_req_path)
+    session.run("python", "-m", "isort", "-sg", "**/.nox*", "--profile", "black", ".")
+    session.run("python", "-m", "black", ".")
+
+
+@nox.session
+def release(session: nox.Session):
+    session.install("-r", dev_req_path)
+    session.run("python", "setup.py", "sdist", "bdist_wheel")
+    session.run("python", "-m", "twine", "upload", "dist/*")
+    session.run("rm", "-rf", "dist", "build", "Flask_Minify.egg-info", ".eggs")
+
+
+@nox.session
+def bump(session: nox.Session):
+    old_version = __version__  # type: ignore
+    new_version = old_version.split(".")
+    new_version[-1] = str(int(new_version[-1]) + 1)
+    new_version = ".".join(new_version)
+
+    with open(about_path, "w") as f:
+        f.write(about_content.replace(old_version, new_version))
+
+    session.run("git", "add", about_path, external=True)
+    session.run(
+        "git", "commit", "-m", f"chore: bump version to {new_version}", external=True
+    )

noxfile.py

@@ -3,3 +3,4 @@
 pytest-pudb
 pudb
 twine
+nox

requirements/dev.txt

@@ -2,7 +2,6 @@
 
 from setuptools import setup
 
-supported_versions = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
 optional_requirements = {"go": 'tdewolff-minify>=2.20.34; platform_system == "Linux"'}
 basedir = path.abspath(path.dirname(__file__))
 long_description = ""
@@ -38,7 +37,7 @@
         requirements += [line for line in f.read().split("\n") if line]
 
 supported_python_classifiers = [
-    "Programming Language :: Python :: {0}".format(v) for v in supported_versions
+    "Programming Language :: Python :: {0}".format(v) for v in __supported_versions__
 ]
 
 setup(