added blag.templates to packages

This reverts commit 169f0f2e0b.

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+exclude = venv,build,docs

.github/dependabot.yml

@@ -4,3 +4,8 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/python-package.yaml

@@ -20,23 +20,62 @@ jobs:
           - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
+        exclude:
+          # 3.8 on windows fails due to some pip issue
+          - os: windows-latest
+            python-version: "3.8"
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Run tests
-      run: |
+    - run: |
+        make venv
+    - run: |
         make test
 
-    - name: Run linter
-      run: |
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+        python-version: "3.x"
+
+    - run: |
+        make venv
+    - run: |
         make lint
 
-    - name: Run mypy
-      run: |
+  mypy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+        python-version: "3.x"
+
+    - run: |
+        make venv
+    - run: |
         make mypy
+
+
+  test-release:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+        python-version: "3.x"
+
+    - run: |
+        make venv
+    - run: |
+        make test-release

CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [1.5.0] - 2023-04-16
+
+* moved to pyproject.toml
+* added python 3.11 to test suite
+* break out lint and mypy from test matrix and only run on linux- and latest
+  stable python to make it a bit more efficient
+* added dependabot check for github actions
+* updated dependencies:
+  * mypy 1.2.0
+  * types-markdown 3.4.2.1
+  * pytest-cov 4.0.0
+  * sphinx 5.3.0
+  * pytest 7.3.0
+  * flake8 6.0.0
+  * twine 4.0.2
+  * wheel 0.40.0
+
+## [1.4.1] - 2022-09-29
+
+* applied multi-arch fix by debian-janitor
+* updated dependencies:
+  * pytest 7.1.3
+  * sphinx 5.2.1
+  * types-markdown 3.4.2
+
 ## [1.4.0] - 2022-09-01
 
 * added type hints and mypy --strict to test suite

Makefile

@@ -14,13 +14,13 @@ endif
 
 
 .PHONY: all
-all: lint mypy test
+all: lint mypy test test-release
 
-$(VENV): requirements.txt requirements-dev.txt setup.py
+$(VENV): requirements.txt requirements-dev.txt pyproject.toml
 	$(PY) -m venv $(VENV)
 	$(BIN)/pip install --upgrade -r requirements.txt
 	$(BIN)/pip install --upgrade -r requirements-dev.txt
-	$(BIN)/pip install -e .
+	$(BIN)/pip install -e .['dev']
 	touch $(VENV)
 
 .PHONY: test
@@ -35,10 +35,17 @@ mypy: $(VENV)
 lint: $(VENV)
 	$(BIN)/flake8
 
-.PHONY: release
-release: $(VENV)
+.PHONY: build
+build: $(VENV)
 	rm -rf dist
-	$(BIN)/python setup.py sdist bdist_wheel
+	$(BIN)/python3 -m build
+
+.PHONY: test-release
+test-release: $(VENV) build
+	$(BIN)/twine check dist/*
+
+.PHONY: release
+release: $(VENV) build
 	$(BIN)/twine upload dist/*
 
 .PHONY: docs

blag/version.py

@@ -1 +1 @@
-__VERSION__ = '1.4.0'
+__VERSION__ = '1.5.0'

debian/changelog

@@ -1,3 +1,29 @@
+blag (1.5.0) unstable; urgency=medium
+
+  * new upstream version
+  * moved to pyproject.toml
+  * added python 3.11 to test suite
+  * break out lint and mypy from test matrix and only run on linux- and latest
+    stable python to make it a bit more efficient
+  * added dependabot check for github actions
+  * updated dependencies:
+    * mypy 1.2.0
+    * types-markdown 3.4.2.1
+    * pytest-cov 4.0.0
+    * sphinx 5.3.0
+    * pytest 7.3.0
+    * flake8 6.0.0
+    * twine 4.0.2
+    * wheel 0.40.0
+
+ -- Bastian Venthur <venthur@debian.org>  Sun, 16 Apr 2023 10:48:18 +0200
+
+blag (1.4.1) unstable; urgency=medium
+
+  * Applied multi-arch fix by debian-janitor
+
+ -- Bastian Venthur <venthur@debian.org>  Thu, 29 Sep 2022 20:41:28 +0200
+
 blag (1.4.0) unstable; urgency=medium
 
   * added type hints and mypy --strict to test suite

debian/control

@@ -8,6 +8,7 @@ Build-Depends:
  dh-sequence-sphinxdoc,
  dh-sequence-python3,
  dh-python,
+ pybuild-plugin-pyproject,
  python3-setuptools,
  python3-all,
  python3-markdown,
@@ -46,6 +47,7 @@ Architecture: all
 Depends:
  ${sphinxdoc:Depends},
  ${misc:Depends},
+Multi-Arch: foreign
 Description: Blog-aware, static site generator (documentation)
  Blag is a blog-aware, static site generator, written in Python. It supports
  the following features:

pyproject.toml

@@ -0,0 +1,70 @@
+[build-system]
+requires = ["setuptools>=64.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "blag"
+authors = [
+    { name="Bastian Venthur", email="mail@venthur.de" },
+]
+description = "blog-aware, static site generator"
+keywords = ["markdown", "blag", "blog", "static site generator", "cli"]
+readme = "README.md"
+license = { file="LICENSE" }
+requires-python = ">=3.8"
+dynamic = ["version"]
+dependencies = [
+    "markdown",
+    "feedgenerator",
+    "jinja2",
+    "pygments",
+]
+
+[project.scripts]
+blag = "blag.blag:main"
+
+[project.urls]
+'Documentation' = 'https://blag.readthedocs.io/'
+'Source' = 'https://github.com/venthur/blag'
+'Changelog' = 'https://github.com/venthur/blag/blob/master/CHANGELOG.md'
+
+[project.optional-dependencies]
+dev = [
+    "build",
+    "sphinx",
+    "twine",
+    "wheel",
+    "pytest",
+    "pytest-cov",
+    "flake8",
+    "mypy",
+    "types-markdown",
+]
+
+[tool.setuptools.dynamic]
+version = {attr = "blag.__VERSION__" }
+
+[tool.setuptools]
+packages = [
+    "blag",
+    "blag.templates",
+]
+
+[tool.setuptools.package-data]
+blag = ["templates/*"]
+
+[tool.pytest.ini_options]
+addopts = """
+    --cov=blag
+    --cov=tests
+    --cov-report=html
+    --cov-report=term-missing:skip-covered
+"""
+
+[tool.mypy]
+files = "blag,tests"
+strict = true
+
+[[tool.mypy.overrides]]
+module = "feedgenerator.*"
+ignore_missing_imports = true

requirements-dev.txt

@@ -1,8 +1,9 @@
-sphinx==5.1.1
-twine==4.0.1
-wheel==0.37.1
-pytest==7.1.2
-pytest-cov==3.0.0
-flake8==5.0.4
-mypy==0.971
-types-markdown==3.4.1
+build==0.9.0
+sphinx==5.3.0
+twine==4.0.2
+wheel==0.40.0
+pytest==7.3.0
+pytest-cov==4.0.0
+flake8==6.0.0
+mypy==1.2.0
+types-markdown==3.4.2.1

setup.cfg

@@ -1,16 +0,0 @@
-[tool:pytest]
-addopts =
-    --cov=blag
-    --cov=tests
-    --cov-report=html
-    --cov-report=term-missing:skip-covered
-
-[flake8]
-exclude = venv,build,docs
-
-[mypy]
-files = blag,tests
-strict = True
-
-[mypy-feedgenerator.*]
-ignore_missing_imports = True

setup.py

@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-
-from setuptools import setup
-
-meta = {}
-exec(open('./blag/version.py').read(), meta)
-meta['long_description'] = open('./README.md').read()
-
-setup(
-    name='blag',
-    version=meta['__VERSION__'],
-    description='blog-aware, static site generator',
-    long_description=meta['long_description'],
-    long_description_content_type='text/markdown',
-    keywords='markdown blag blog static site generator cli',
-    author='Bastian Venthur',
-    author_email='mail@venthur.de',
-    url='https://github.com/venthur/blag',
-    project_urls={
-        'Documentation': 'https://blag.readthedocs.io/',
-        'Source': 'https://github.com/venthur/blag',
-        'Changelog':
-            'https://github.com/venthur/blag/blob/master/CHANGELOG.md',
-    },
-    python_requires='>=3.8',
-    package_data={
-        'blag': ['templates/*'],
-    },
-    install_requires=[
-        'markdown',
-        'feedgenerator',
-        'jinja2',
-        'pygments',
-    ],
-    packages=['blag'],
-    entry_points={
-        'console_scripts': [
-            'blag = blag.blag:main'
-        ]
-    },
-    license='MIT',
-)