Merge 8750250 into ce86e33

pronovic · Oct 11, 2023 · c266141 · c266141
2 parents ce86e33 + 8750250
commit c266141
Show file tree

Hide file tree

Showing 8 changed files with 445 additions and 520 deletions.
diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -22,17 +22,17 @@ jobs:
     secrets: inherit
     with:
       matrix-os-version: "[ 'ubuntu-latest' ]"
-      matrix-python-version: "[ '3.8', '3.9', '3.10', '3.11' ]"  # run Linux tests on all supported Python versions
-      poetry-version: "1.5.1"
+      matrix-python-version: "[ '3.9', '3.10', '3.11', '3.12' ]"  # run Linux tests on all supported Python versions
+      poetry-version: "1.6.1"
       enable-coveralls: true  # only report to coveralls.io for tests that run on Linux
   macos-build-and-test:
     name: "MacOS"
     uses: pronovic/gha-shared-workflows/.github/workflows/poetry-build-and-test.yml@v3
     secrets: inherit
     with:
       matrix-os-version: "[ 'macos-latest' ]"
-      matrix-python-version: "[ '3.11' ]"  # only run MacOS tests on latest Python
-      poetry-version: "1.5.1"
+      matrix-python-version: "[ '3.12' ]"  # only run MacOS tests on latest Python
+      poetry-version: "1.6.1"
       enable-coveralls: false 
   release:
     name: "Release"
@@ -41,6 +41,6 @@ jobs:
     needs: [ linux-build-and-test, macos-build-and-test ]
     secrets: inherit
     with:
-      python-version: "3.8"
-      poetry-version: "1.5.1"
+      python-version: "3.9"
+      poetry-version: "1.6.1"
       publish-pypi: true
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -2,7 +2,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: '3.8'
+    python: '3.9'
 python:
   install:
     - method: pip

diff --git a/Changelog b/Changelog
@@ -1,3 +1,9 @@
+Version 0.6.6     unreleased
+
+	* Upgrade major dependencies.
+	* Upgrade build process to Poetry v1.6.1.
+	* Add support for Python v3.12 and drop support for v3.8.
+
 Version 0.6.5     unreleased
 
 	* Fix checktabs to be safe for file named '-'.

diff --git a/PyPI.md b/PyPI.md
@@ -7,6 +7,7 @@
 [![Test Suite](https://github.com/pronovic/hcoop-meetbot/workflows/Test%20Suite/badge.svg)](https://github.com/pronovic/hcoop-meetbot/actions?query=workflow%3A%22Test+Suite%22)
 [![docs](https://readthedocs.org/projects/hcoop-meetbot/badge/?version=stable&style=flat)](https://hcoop-meetbot.readthedocs.io/en/stable/)
 [![coverage](https://coveralls.io/repos/github/pronovic/hcoop-meetbot/badge.svg?branch=master)](https://coveralls.io/github/pronovic/hcoop-meetbot?branch=master)
+[![Poetry](https://img.shields.io/endpoint?url=https://python-poetry.org/badge/v0.json)](https://python-poetry.org/)
 
 [hcoop-meetbot](https://github.com/pronovic/hcoop-meetbot) is a plugin for [Limnoria](https://github.com/ProgVal/Limnoria), a bot framework for IRC.  It is designed to help run meetings on IRC.  It was originally written for quarterly board meetings at [HCoop](https://hcoop.net), when Ken was on the board there.
 

diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@
 [![Test Suite](https://github.com/pronovic/hcoop-meetbot/workflows/Test%20Suite/badge.svg)](https://github.com/pronovic/hcoop-meetbot/actions?query=workflow%3A%22Test+Suite%22)
 [![docs](https://readthedocs.org/projects/hcoop-meetbot/badge/?version=stable&style=flat)](https://hcoop-meetbot.readthedocs.io/en/stable/)
 [![coverage](https://coveralls.io/repos/github/pronovic/hcoop-meetbot/badge.svg?branch=master)](https://coveralls.io/github/pronovic/hcoop-meetbot?branch=master)
+[![Poetry](https://img.shields.io/endpoint?url=https://python-poetry.org/badge/v0.json)](https://python-poetry.org/)
 
 This is a plugin for [Limnoria](https://github.com/ProgVal/Limnoria), a bot framework for IRC.  It is designed to help run meetings on IRC.  It was originally written for quarterly board meetings at [HCoop](https://hcoop.net), when Ken was on the board there.
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -44,36 +44,36 @@ meetbot = "hcoopmeetbotlogic.cli:meetbot"
 "HcoopMeetbot" = "HcoopMeetbot:plugin"
 
 [tool.poetry.dependencies]
-python = ">=3.8,<4"
-limnoria = ">=2023.01.28"
-attrs = "^22.2.0"
-cattrs = "^22.2.0"
-pytz = ">=2022.7.1"
+python = ">=3.9,<4"
+limnoria = ">=2023.09.24"
+attrs = "^23.1.0"
+cattrs = "^23.1.2"
+pytz = ">=2023.3.post1"
 genshi = "^0.7.7"
-click = "^8.1.3"
-importlib-metadata = { version="^6.0.0", optional=true }
-sphinx = { version="^6.1.3", optional=true }
-sphinx-autoapi = { version="^2.0.1", optional=true }
+click = "^8.1.7"
+importlib-metadata = { version="^6.8.0", optional=true }
+sphinx = { version="^7.2.6", optional=true }
+sphinx-autoapi = { version="^3.0.0", optional=true }
 
 [tool.poetry.extras]
 docs = [ "sphinx", "sphinx-autoapi" ]
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^7.2.1"
-pytest-testdox = "^3.0.1"
-coverage = "^6.5.0"
-pylint = "^2.16.2"
-pre-commit = "^3.1.0"
-black = "^23.1.0"
-mypy = "^1.0.1"
+pytest = "^7.4.2"
+pytest-testdox = "^3.1.0"
+coverage = "^6.5.0"  # coveralls needs v6
+pylint = "^3.0.1"
+pre-commit = "^3.4.0"
+black = "^23.9.1"
+mypy = "^1.6.0"
 isort = "^5.12.0"
 coveralls = "^3.3.1"
-types-pytz = ">=2022.7.1.2"
+types-pytz = ">=2023.3.1.1"
 colorama = "~0, >=0.4.6"
 
 [tool.black]
 line-length = 132
-target-version = ['py38', 'py39', 'py310', 'py311' ]
+target-version = [ 'py39', 'py310', 'py311', 'py312' ]
 include = '(src\/scripts\/.*$|\.pyi?$)'
 exclude = '''
 /(

diff --git a/src/hcoopmeetbotlogic/state.py b/src/hcoopmeetbotlogic/state.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: set ft=python ts=4 sw=4 expandtab:
+# pylint: disable=used-before-assignment:
 
 """
 Shared plugin state, maintained as singleton objects.