.pre-commit-config.yaml

@@ -4,6 +4,7 @@ repos:
 - repo: meta
   hooks:
   - id: check-hooks-apply
+  - id: check-useless-excludes
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v4.6.0
@@ -17,15 +18,16 @@ repos:
   - id: debug-statements
   - id: destroyed-symlinks
   - id: end-of-file-fixer
-    stages: [commit]
+    stages: [commit, manual]
   - id: fix-byte-order-marker
   - id: fix-encoding-pragma
     args: [--remove]
   - id: mixed-line-ending
     args: [--fix=lf]
+    stages: [commit, manual]
   - id: trailing-whitespace
     exclude_types: [markdown, plain-text]
-    stages: [commit]
+    stages: [commit, manual]
 
 - repo: https://github.com/jorisroovers/gitlint
   rev: v0.19.1
@@ -39,7 +41,7 @@ repos:
   - id: check-for-squash
   - id: copyright-notice
     args: [--min-size=1]
-    exclude: setup\.py
+    stages: [commit, manual]
   - id: protect-first-parent
 
 - repo: https://github.com/pre-commit/pygrep-hooks

pyproject.toml

 [build-system]
-requires = ["setuptools>=40.8.0", "wheel"]
-build-backend = "setuptools.build_meta:__legacy__"
+requires = ["flit_core ~=3.8"]
+build-backend = "flit_core.buildapi"
+
+
+[project]
+name = "wpa-supplicant-client"
+version = "0.3.0"
+description = "A client package for connecting to, configuring and controlling wpa_supplicant daemons"
+license = {file = "LICENCE.txt"}
+
+authors = [
+	{name = "Dom Sekotill", email = "dom.sekotill@kodo.org.uk"},
+]
+
+classifiers = [
+	"Intended Audience :: Developers",
+	"Operating System :: POSIX",
+]
+
+requires-python = "~=3.10"
+dependencies = [
+	"anyio ~=4.1",
+]
+
+[project.optional-dependencies]
+test = [
+	"trio",
+]
+
+[project.urls]
+Repository = "https://code.kodo.org.uk/dom/wpa-supplicant-client"
+Issues = "https://code.kodo.org.uk/dom/wpa-supplicant-client/-/issues"
+
+
+[tool.flit.module]
+name = "wpa_supplicant"
+
 
 [tool.isort]
 force_single_line = true
+line_length = 92
+
 
 [tool.unimport]
 ignore-init = true

setup.cfg

-[metadata]
-name = wpa-supplicant-client
-version = attr: wpa_supplicant.__version__
-author = Dom Sekotill
-author_email = dom.sekotill@kodo.org.uk
-description = A client package for connecting to, configuring and controlling wpa_supplicant daemons
-long_description = file: README.md
-long_description_content_type = text/markdown
-url = 'https://code.kodo.org.uk/dom/wpa-supplicant-client.git'
-license = Apache-2.0
-license_files =
-  LICENCE.txt
-
-classifiers =
-  Development Status :: 2 - Pre-Alpha
-  Intended Audience :: Developers
-  License :: OSI Approved
-  License :: OSI Approved :: Apache Software License
-  Natural Language :: English
-  Operating System :: POSIX
-  Programming Language :: Python
-  Programming Language :: Python :: 3.8
-  Programming Language :: Python :: 3.9
-  Programming Language :: Python :: 3.10
-  Typing::Typed
-
-[options]
-python_requires = >= 3.8
-packages = find:
-setup_requires =
-  setuptools >= 40.6
-install_requires =
-  anyio ~=3.0
-
-[options.packages.find]
-include =
-  wpa_supplicant
-  wpa_supplicant.*
-
-[options.package_data]
-wpa_supplicant = py.typed
-
-[options.extras_require]
-test =
-  nose2[coverage_plugin]
-  trio
-
-[isort]
-force_single_line = true
-
-[mypy]
-strict = true
-warn_unused_configs = True
-warn_unreachable = true
-implicit_reexport = true
-
-[flake8]
-max-line-length = 92
-max-doc-length = 92
-use-flake8-tabs = true
-blank-lines-indent = never
-indent-tabs-def = 1
-format = pylint
-select = C,D,E,ET,F,SFS,T,W,WT
-
-extend-exclude =
-  setup.py
-
-per-file-ignores =
-  setup.py: D100, E702
-  tests/*.py: D100, C801
-  **/__init__.py: D104, F401, F403
-  **/__main__.py: D100, E702
-  **/_*.py: D
-
-ignore =
-  ;[ Missing docstring in public method ]
-  ; Handled by pylint, which does it better
-  D102
-
-  ;[ Missing docstring in magic method ]
-  ; Magic/dunder methods are well-known
-  D105
-
-  ;[ Misisng docstring in __init__ ]
-  ; Document basic construction in the class docstring
-  D107
-
-  ;[ One-line docstring should fit on one line with quotes ]
-  ; Prefer top-and-bottom style always
-  D200
-
-  ;[ Docstring should be indented with spaces, not tabs ]
-  ; Tabs, absolutely always
-  D206
-
-  ;[ Use u""" for Unicode docstrings ]
-  ; This must be for Python 2?
-  D302
-
-  ;[ First line should end with a period ]
-  ; First line should *NEVER* end with a period
-  D400
-
-  ;[ First line should be in the imperative mood ]
-  ; I like this for functions and methods, not for properties. This stands until
-  ; pydocstyle splits a new code for properties or flake8 adds some way of
-  ; filtering codes with line regexes like golangci-lint.
-  D401
-
-  ;[ Line too long ]
-  ; Prefer B950 implementation
-  E501
-
-  ;[ multiple statements on one line (%s) ]
-  E701 E704
-
-  ;[ unexpected number of spaces at start of statement line ]
-  ;[ unexpected number of tabs and spaces at start of statement line ]
-  ; Don't want spaces...
-  ET122 ET128
-
-  ;[ Line break before binary operator ]
-  ; Not considered current
-  W503
-
-  ;[ Format-method string formatting ]
-  ; Allow this style
-  SFS201
-
-  ;[ f-string string formatting ]
-  ; Allow this style
-  SFS301
-
-include =
-  ;[ First word of the docstring should not be This ]
-  D404
-
-  ; flake8-bugbear plugin
-  ; B950 is a replacement for E501
-  B0 B903 B950
-
-; vim: sw=2 sts=2 expandtab

setup.py

-#!/usr/bin/env python3
-"""Setuptools entrypoint"""
-
-from setuptools import setup
-
-setup()

wpa_supplicant/__init__.py

 """
 Async control of WPA-Supplicant from a Python process
 
-#  Copyright 2019-2021  Dom Sekotill <dom.sekotill@kodo.org.uk>
+#  Copyright 2019-2021, 2024  Dom Sekotill <dom.sekotill@kodo.org.uk>
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -15,5 +15,3 @@ Async control of WPA-Supplicant from a Python process
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 """
-
-__version__ = "0.3.0"