Merge pull request #987 from mulkieran/version-3.5.2

Version 3.5.2

.github/workflows/main.yml

@@ -50,7 +50,7 @@ jobs:
           - dependencies: yamllint
             task: make -f Makefile yamllint
     runs-on: ubuntu-latest
-    container: fedora:37  # CURRENT DEVELOPMENT ENVIRONMENT
+    container: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies
@@ -71,10 +71,10 @@ jobs:
           # MANDATORY CHECKS USING CURRENT DEVELOPMENT ENVIRONMENT
           - task: make -f Makefile all-tests
             rust_log: RUST_LOG=stratisd=debug
-            image: fedora:37  # CURRENT DEVELOPMENT ENVIRONMENT
+            image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
           - task: make -f Makefile coverage-no-html
             rust_log:
-            image: fedora:37  # CURRENT DEVELOPMENT ENVIRONMENT
+            image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
           # MANDATORY CHECKS USING LOWEST SUPPORTED ENVIRONMENT PROXY
           - task: make -f Makefile all-tests
             rust_log: RUST_LOG=stratisd=debug
@@ -131,3 +131,31 @@ jobs:
           STRATISD=/usr/libexec/stratisd
           PYTHONPATH=./src
           ${{ matrix.task }}
+
+  lowest-environment-checks:
+    strategy:
+      matrix:
+        include:
+          - dependencies: >
+              python-setuptools
+              python3-dbus-client-gen
+              python3-dbus-python-client-gen
+              python3-justbytes
+              python3-dateutil
+              python3-packaging
+              python3-psutil
+              python3-wcwidth
+            task: make -f Makefile legacy-package
+    runs-on: ubuntu-latest
+    container: fedora:34  # LOWEST DEVELOPMENT ENVIRONMENT
+    steps:
+      - name: Display Python version
+        run: python3 --version
+      - uses: actions/checkout@v3
+      - name: Install dependencies
+        run: >
+          dnf install -y
+          make
+          ${{ matrix.dependencies }}
+      - name: ${{ matrix.task }}
+        run: ${{ matrix.task }}

CHANGES.txt

@@ -1,3 +1,14 @@
+stratis-cli 3.5.2
+=================
+Required stratisd version: 3.5.0
+
+Recommended development environment: Fedora 38
+Lowest supported Python interpreter: 3.9.16
+
+- Set up patch branch:
+  https://github.com/stratis-storage/stratis-cli/pull/985
+
+
 stratis-cli 3.5.1
 =================
 Required stratisd version: 3.5.0

Makefile

@@ -84,3 +84,8 @@ all-tests: unittest-tests sim-tests
 .PHONY: yamllint
 yamllint:
 	yamllint --strict .github/workflows/*.yml
+
+.PHONY: legacy-package
+legacy-package:
+	python3 setup.py build
+	python3 setup.py install

docs/stratis.txt

@@ -271,6 +271,8 @@ Physical Size::
           pool and has since been expanded.
 Tier::
 	  The data tier type ("Data" or "Cache")
+UUID::
+	  The UUID of the block device.
 
 FIELDS for stratis key list
 

pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"

setup.cfg

@@ -0,0 +1,47 @@
+[metadata]
+name = stratis-cli
+author = Anne Mulhern
+author_email = [email protected]
+url = https://github.com/stratis-storage/stratis-cli
+description = Stratis CLI
+license = Apache-2.0
+long_description = file: README.rst
+long_description_content_type = text/x-rst
+version = attr: stratis_cli._version.__version__
+platforms =
+    Linux
+classifiers=
+    Development Status :: 5 - Production/Stable
+    Environment :: Console
+    Intended Audience :: Developers
+    Intended Audience :: System Administrators
+    License :: OSI Approved :: Apache Software License
+    Operating System :: POSIX :: Linux
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: Implementation :: CPython
+    Programming Language :: Python :: Implementation :: PyPy
+    Topic :: Software Development :: Libraries
+    Topic :: System :: Filesystems
+    Topic :: Systems Administration
+
+[options]
+install_requires =
+    dbus-client-gen>=0.4
+    dbus-python-client-gen>=0.7
+    justbytes>=0.14
+    packaging
+    psutil
+    python-dateutil
+    wcwidth
+
+package_dir =
+    =src
+
+packages =
+    stratis_cli
+    stratis_cli._parser
+    stratis_cli._actions
+
+scripts =
+    bin/stratis

setup.py

@@ -2,60 +2,7 @@
 Python packaging file for setup tools.
 """
 
-# isort: STDLIB
-import os
-
 # isort: THIRDPARTY
 import setuptools
 
-
-def local_file(name):
-    """
-    Function to obtain the relative path of a filename.
-    """
-    return os.path.relpath(os.path.join(os.path.dirname(__file__), name))
-
-
-with open(local_file("src/stratis_cli/_version.py"), encoding="utf-8") as o:
-    exec(o.read())  # pylint: disable=exec-used #nosec B102
-
-with open(local_file("README.rst"), encoding="utf-8") as o:
-    long_description = o.read()
-
-setuptools.setup(
-    name="stratis-cli",
-    version=__version__,  # pylint: disable=undefined-variable
-    author="Anne Mulhern",
-    author_email="[email protected]",
-    description="Stratis CLI",
-    long_description=long_description,
-    platforms=["Linux"],
-    license="Apache 2.0",
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Environment :: Console",
-        "Intended Audience :: Developers",
-        "Intended Audience :: System Administrators",
-        "License :: OSI Approved :: Apache Software License",
-        "Operating System :: POSIX :: Linux",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: Implementation :: CPython",
-        "Programming Language :: Python :: Implementation :: PyPy",
-        "Topic :: Software Development :: Libraries",
-        "Topic :: System :: Filesystems",
-        "Topic :: Systems Administration",
-    ],
-    install_requires=[
-        "dbus-client-gen>=0.4",
-        "dbus-python-client-gen>=0.7",
-        "justbytes>=0.14",
-        "packaging",
-        "psutil",
-        "python-dateutil",
-        "wcwidth",
-    ],
-    package_dir={"": "src"},
-    packages=setuptools.find_packages("src"),
-    scripts=["bin/stratis"],
-)
+setuptools.setup()

src/stratis_cli/_version.py

@@ -17,5 +17,5 @@
     .. moduleauthor::  mulhern  <[email protected]>
 """
 
-__version_info__ = (3, 5, 1)
+__version_info__ = (3, 5, 2)
 __version__ = ".".join(str(x) for x in __version_info__)