From eaf00e7dd08dd10af3c9018cb6f46e20480d5faa Mon Sep 17 00:00:00 2001 From: Adrian Dischinger <72736591+AdrianDsg@users.noreply.github.com> Date: Mon, 20 Nov 2023 10:32:16 +0000 Subject: [PATCH 1/3] docs: fix typo in README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 78f71d6..f6e3a66 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ An MkDocs plugin to minify HTML, JS or CSS files prior to being written to disk. -HTML minification is done using [htmlmin](https://github.com/mankyd/htmlmin). +HTML minification is done using [htmlmin2](https://github.com/wilhelmer/htmlmin). JS minification is done using [jsmin](https://github.com/tikitu/jsmin/). @@ -42,7 +42,7 @@ plugins: ## Options -- `minify_html`: +- `minify_html`: - Defaults to `False`. - Sets whether HTML files should be minified. - `minify_js`: @@ -53,7 +53,7 @@ plugins: - Defaults to `False`. - Sets whether CSS files should be minified.
If set to `True`, you must specify the CSS to be minified files using `css_files` (see below). -- `htmlmin_opts`: +- `htmlmin_opts`: - Defaults to `None`. - Sets runtime htmlmin API options using the [config parameters of htmlmin](https://htmlmin.readthedocs.io/en/latest/reference.html#main-functions) - `cache_safe`: From 5dd3f98a4249a8312329eccfd5957d3e370ce724 Mon Sep 17 00:00:00 2001 From: Adrian Dischinger <72736591+AdrianDsg@users.noreply.github.com> Date: Mon, 20 Nov 2023 10:32:40 +0000 Subject: [PATCH 2/3] chore: add README.md to package metadata --- setup.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bbff729..3c7c77b 100644 --- a/setup.py +++ b/setup.py @@ -1,10 +1,16 @@ from setuptools import find_packages, setup +from pathlib import Path + +# read contents of README.md to include it in package metadata +readme_file = Path(__file__).parent / "README.md" +long_description = readme_file.read_text("utf-8") setup( name="mkdocs-minify-plugin", version="0.7.1", description="An MkDocs plugin to minify HTML, JS or CSS files prior to being written to disk", - long_description="", + long_description=long_description, + long_description_content_type="text/markdown", keywords="mkdocs minify publishing documentation html css", url="https://github.com/byrnereese/mkdocs-minify-plugin", author="Byrne Reese, Lars Wilhelmer", From 83a7a5da1c29c8345e4ea83bfa65baad9cd5aab4 Mon Sep 17 00:00:00 2001 From: Adrian Dischinger <72736591+AdrianDsg@users.noreply.github.com> Date: Mon, 20 Nov 2023 10:34:22 +0000 Subject: [PATCH 3/3] chore: remove python 3.7 support and upgrade setup-python action --- .github/workflows/test.yml | 4 ++-- setup.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8a23ee1..d0a49c6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,10 +14,10 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 diff --git a/setup.py b/setup.py index 3c7c77b..5a7ea65 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ author="Byrne Reese, Lars Wilhelmer", author_email="byrne@majordojo.com", license="MIT", - python_requires=">=3.7", + python_requires=">=3.8", install_requires=[ "mkdocs>=1.4.1", "htmlmin2>=0.1.13", @@ -30,7 +30,6 @@ "License :: OSI Approved :: MIT License", "Programming Language :: Python", "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",