Merge branch 'release/24.10.9'

davedittrich · Oct 16, 2024 · 8a9f001 · 8a9f001
2 parents 5eb29d5 + c918ecc
commit 8a9f001
Show file tree

Hide file tree

Showing 9 changed files with 648 additions and 316 deletions.
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -10,11 +10,14 @@ build:
   tools:
     python: "3.12"
 
-python:
-   install:
-      - requirements: requirements.txt
-      - method: pip
-        path: .
+post_create_environment:
+  # Install poetry
+  - pip install poetry
+  # Tell poetry to not use a virtual environment
+  - poetry config virtualenvs.create false
+post_install:
+  # Install dependencies
+  - poetry install --with docs
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -24,16 +24,16 @@ History
 .. Fixed for any bug fixes.
 .. Security in case of vulnerabilities.
 
-24.10.8 (2024-10-16)
+24.10.9 (2024-10-16)
 ~~~~~~~~~~~~~~~~~~~~
 
 Changed
 ^^^^^^^
 
 - Now using Poetry for package management and installation.
 - Refactored GitHub Actions workflows.
-- Updated ReadTheDocs configuration.
-- (Versions 24.10.0 - 24.10.7 were fix attempts.)
+- Updated ReadTheDocs configuration and build process.
+- (Versions 24.10.0 - 24.10.8 were fix attempts.)
 
 23.4.2 (2023-04-20)
 ~~~~~~~~~~~~~~~~~~~

diff --git a/README.rst b/README.rst
@@ -17,7 +17,7 @@ Python command line app for managing groups of secrets (passwords, API keys, etc
 other project variables. Reduces security risks from things like weak default passwords,
 secrets stored in files in the source code repository directory.
 
-Version: 24.10.8
+Version: 24.10.9
 
 * Free software: `Apache 2.0 License <https://www.apache.org/licenses/LICENSE-2.0>`_
 * Documentation: https://python_secrets.readthedocs.org.
@@ -1212,7 +1212,7 @@ Decrypted, it looks like this:
     myapp_app_password=brunt.outclass.alike.turbine
 
     --
-    Sent using psec version 24.10.8
+    Sent using psec version 24.10.9
     https://pypi.org/project/python-secrets/
     https://github.com/davedittrich/python_secrets
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-24.10.8
+24.10.9
diff --git a/poetry.lock b/poetry.lock
diff --git a/psec/__init__.py b/psec/__init__.py
@@ -7,7 +7,7 @@
 
 __author__ = 'Dave Dittrich'
 __email__ = '[email protected]'
-__release__ = '24.10.8'
+__release__ = '24.10.9'
 
 try:
     from psec._version import (

diff --git a/pyproject.toml b/pyproject.toml
@@ -139,9 +139,16 @@ poetry = ">=1.8.3"
 poetry-dynamic-versioning = "^1.4.1"
 psutil = "^6.0.0"
 requests = ">=2.31.0"
-sphinx = "^8.0.2"
 xkcdpass ="^1.19.9"
 
+[tool.poetry.group.docs]
+optional = true
+
+[tool.poetry.group.docs.dependencies]
+sphinx = ">=4.0"
+sphinx-autobuild = ">=2021.0"
+sphinx-rtd-theme = ">=1.0"
+
 [tool.poetry.group.dev]
 optional = true
 

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 24.10.8
+current_version = 24.10.9
 commit = False
 tag = False
 

diff --git a/tox.ini b/tox.ini
@@ -93,6 +93,7 @@ commands = bandit -c bandit.yaml -r psec -x tests -n5
 #    make
 #    poetry
 commands =
+   poetry install --with=docs
    make clean install
    sphinx-build -b html docs docs/_build