diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ff3fc9..f2f60e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [2.4.0] Unreleased ### Added + +### Changed + +### Removed + +## [2.3.2] 2025-09-28 + +### Added + ### Changed - Fixed python path in systemd unit file. - Used correct user id/channel id with postMessage when using blocks in Slack chat adapter. + - Updated dockerfile to use ubuntu22.04 and python3.10 + - Fixed version number in documentation. ### Removed diff --git a/contrib/systemd/errbot.service b/contrib/systemd/errbot.service index 7ac7709..a207f8c 100644 --- a/contrib/systemd/errbot.service +++ b/contrib/systemd/errbot.service @@ -4,7 +4,7 @@ After=network.target [Service] User=errbot -Environment="CONFIGFILE=/data/errbot/etc/config.py" +Environment="CONFIGFILE=/opt/errbot/etc/config.py" ExecStart=/opt/errbot/bin/python /opt/errbot/bin/errbot --config $CONFIGFILE ExecStop=/bin/kill -SIGINT $MAINPID Restart=on-failure diff --git a/docs/conf.py b/docs/conf.py index dcee90f..54d6824 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,56 +1,19 @@ -# Configuration file for the Sphinx documentation builder. -# -# This file only contains a selection of the most common options. For a full -# list see the documentation: -# http://www.sphinx-doc.org/en/master/config - -# -- Path setup -------------------------------------------------------------- - -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -# -# import os -# import sys -# sys.path.insert(0, os.path.abspath('.')) - - -# -- Project information ----------------------------------------------------- +# Reference: http://www.sphinx-doc.org/en/master/config +import os +import sys +sys.path.insert(0, os.path.abspath('../src/err-stackstorm')) +from errst2lib.version import ERR_STACKSTORM_VERSION project = "err-stackstorm" copyright = "2019-2022, err-stackstorm contributors" author = "err-stackstorm contributors" - -# The full version, including alpha/beta/rc tags -release = "2.2.0" - - -# -- General configuration --------------------------------------------------- +release = ERR_STACKSTORM_VERSION master_doc = "index" -# Add any Sphinx extension module names here, as strings. They can be -# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom -# ones. extensions = [] - -# Add any paths that contain templates here, relative to this directory. templates_path = ["_templates"] - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -# This pattern also affects html_static_path and html_extra_path. exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"] - -# -- Options for HTML output ------------------------------------------------- - -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -# # html_theme = 'alabaster' html_theme = "sphinx_rtd_theme" - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ["_static"] diff --git a/pyproject.toml b/pyproject.toml index 8425752..a043d06 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" [project] name = "err-stackstorm" -version = "2.3.1" +version = "2.3.2" authors = [{ name="Err-stackstorm maintainers", email="nzlosh@yahoo.com" }] keywords = [ "errbot", diff --git a/src/err-stackstorm/errst2lib/chat_adapters.py b/src/err-stackstorm/errst2lib/chat_adapters.py index 2f7e870..a4cdfcb 100644 --- a/src/err-stackstorm/errst2lib/chat_adapters.py +++ b/src/err-stackstorm/errst2lib/chat_adapters.py @@ -405,7 +405,7 @@ def _post_block_message(self, whisper, message, target_id, extra): else: LOG.warning("target_id is type %s that isn't a Person or Room!", type(target_id)) - LOG.debug(f"Sending Slack Block {extra}") + LOG.debug("Sending Slack Block %s", extra) self.bot_plugin._bot.slack_web.api_call("chat.postMessage", data=extra) def format_help(self, help_strings): diff --git a/src/err-stackstorm/errst2lib/version.py b/src/err-stackstorm/errst2lib/version.py index e33f478..ea16adc 100644 --- a/src/err-stackstorm/errst2lib/version.py +++ b/src/err-stackstorm/errst2lib/version.py @@ -1 +1 @@ -ERR_STACKSTORM_VERSION="2.3.1" +ERR_STACKSTORM_VERSION = "2.3.2" diff --git a/src/err-stackstorm/html/index.html b/src/err-stackstorm/html/index.html index 33dc85b..aa786ff 100644 --- a/src/err-stackstorm/html/index.html +++ b/src/err-stackstorm/html/index.html @@ -6,8 +6,8 @@