Skip to content

Commit dde80a3

Browse files
mulkieranmulkieran
authored
Merge pull request #987 from mulkieran/version-3.5.2
Version 3.5.2
2 parents 0620e05 + 0bc2baa commit dde80a3

File tree

8 files changed

+101
-58
lines changed

8 files changed

+101
-58
lines changed

‎.github/workflows/main.yml‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- dependencies: yamllint
5151
task: make -f Makefile yamllint
5252
runs-on: ubuntu-latest
53-
container: fedora:37 # CURRENT DEVELOPMENT ENVIRONMENT
53+
container: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT
5454
steps:
5555
- uses: actions/checkout@v3
5656
- name: Install dependencies
@@ -71,10 +71,10 @@ jobs:
7171
# MANDATORY CHECKS USING CURRENT DEVELOPMENT ENVIRONMENT
7272
- task: make -f Makefile all-tests
7373
rust_log: RUST_LOG=stratisd=debug
74-
image: fedora:37 # CURRENT DEVELOPMENT ENVIRONMENT
74+
image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT
7575
- task: make -f Makefile coverage-no-html
7676
rust_log:
77-
image: fedora:37 # CURRENT DEVELOPMENT ENVIRONMENT
77+
image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT
7878
# MANDATORY CHECKS USING LOWEST SUPPORTED ENVIRONMENT PROXY
7979
- task: make -f Makefile all-tests
8080
rust_log: RUST_LOG=stratisd=debug
@@ -131,3 +131,31 @@ jobs:
131131
STRATISD=/usr/libexec/stratisd
132132
PYTHONPATH=./src
133133
${{ matrix.task }}
134+
135+
lowest-environment-checks:
136+
strategy:
137+
matrix:
138+
include:
139+
- dependencies: >
140+
python-setuptools
141+
python3-dbus-client-gen
142+
python3-dbus-python-client-gen
143+
python3-justbytes
144+
python3-dateutil
145+
python3-packaging
146+
python3-psutil
147+
python3-wcwidth
148+
task: make -f Makefile legacy-package
149+
runs-on: ubuntu-latest
150+
container: fedora:34 # LOWEST DEVELOPMENT ENVIRONMENT
151+
steps:
152+
- name: Display Python version
153+
run: python3 --version
154+
- uses: actions/checkout@v3
155+
- name: Install dependencies
156+
run: >
157+
dnf install -y
158+
make
159+
${{ matrix.dependencies }}
160+
- name: ${{ matrix.task }}
161+
run: ${{ matrix.task }}

‎CHANGES.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
stratis-cli 3.5.2
2+
=================
3+
Required stratisd version: 3.5.0
4+
5+
Recommended development environment: Fedora 38
6+
Lowest supported Python interpreter: 3.9.16
7+
8+
- Set up patch branch:
9+
https://github.com/stratis-storage/stratis-cli/pull/985
10+
11+
112
stratis-cli 3.5.1
213
=================
314
Required stratisd version: 3.5.0

‎Makefile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,8 @@ all-tests: unittest-tests sim-tests
8484
.PHONY: yamllint
8585
yamllint:
8686
yamllint --strict .github/workflows/*.yml
87+
88+
.PHONY: legacy-package
89+
legacy-package:
90+
python3 setup.py build
91+
python3 setup.py install

‎docs/stratis.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,8 @@ Physical Size::
271271
pool and has since been expanded.
272272
Tier::
273273
The data tier type ("Data" or "Cache")
274+
UUID::
275+
The UUID of the block device.
274276

275277
FIELDS for stratis key list
276278

‎pyproject.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[build-system]
2+
requires = ["setuptools"]
3+
build-backend = "setuptools.build_meta"

‎setup.cfg‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
[metadata]
2+
name = stratis-cli
3+
author = Anne Mulhern
4+
author_email = amulhern@redhat.com
5+
url = https://github.com/stratis-storage/stratis-cli
6+
description = Stratis CLI
7+
license = Apache-2.0
8+
long_description = file: README.rst
9+
long_description_content_type = text/x-rst
10+
version = attr: stratis_cli._version.__version__
11+
platforms =
12+
Linux
13+
classifiers=
14+
Development Status :: 5 - Production/Stable
15+
Environment :: Console
16+
Intended Audience :: Developers
17+
Intended Audience :: System Administrators
18+
License :: OSI Approved :: Apache Software License
19+
Operating System :: POSIX :: Linux
20+
Programming Language :: Python
21+
Programming Language :: Python :: 3
22+
Programming Language :: Python :: Implementation :: CPython
23+
Programming Language :: Python :: Implementation :: PyPy
24+
Topic :: Software Development :: Libraries
25+
Topic :: System :: Filesystems
26+
Topic :: Systems Administration
27+
28+
[options]
29+
install_requires =
30+
dbus-client-gen>=0.4
31+
dbus-python-client-gen>=0.7
32+
justbytes>=0.14
33+
packaging
34+
psutil
35+
python-dateutil
36+
wcwidth
37+
38+
package_dir =
39+
=src
40+
41+
packages =
42+
stratis_cli
43+
stratis_cli._parser
44+
stratis_cli._actions
45+
46+
scripts =
47+
bin/stratis

‎setup.py‎

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,60 +2,7 @@
22
Python packaging file for setup tools.
33
"""
44

5-
# isort: STDLIB
6-
import os
7-
85
# isort: THIRDPARTY
96
import setuptools
107

11-
12-
def local_file(name):
13-
"""
14-
Function to obtain the relative path of a filename.
15-
"""
16-
return os.path.relpath(os.path.join(os.path.dirname(__file__), name))
17-
18-
19-
with open(local_file("src/stratis_cli/_version.py"), encoding="utf-8") as o:
20-
exec(o.read()) # pylint: disable=exec-used #nosec B102
21-
22-
with open(local_file("README.rst"), encoding="utf-8") as o:
23-
long_description = o.read()
24-
25-
setuptools.setup(
26-
name="stratis-cli",
27-
version=__version__, # pylint: disable=undefined-variable
28-
author="Anne Mulhern",
29-
author_email="amulhern@redhat.com",
30-
description="Stratis CLI",
31-
long_description=long_description,
32-
platforms=["Linux"],
33-
license="Apache 2.0",
34-
classifiers=[
35-
"Development Status :: 5 - Production/Stable",
36-
"Environment :: Console",
37-
"Intended Audience :: Developers",
38-
"Intended Audience :: System Administrators",
39-
"License :: OSI Approved :: Apache Software License",
40-
"Operating System :: POSIX :: Linux",
41-
"Programming Language :: Python",
42-
"Programming Language :: Python :: 3",
43-
"Programming Language :: Python :: Implementation :: CPython",
44-
"Programming Language :: Python :: Implementation :: PyPy",
45-
"Topic :: Software Development :: Libraries",
46-
"Topic :: System :: Filesystems",
47-
"Topic :: Systems Administration",
48-
],
49-
install_requires=[
50-
"dbus-client-gen>=0.4",
51-
"dbus-python-client-gen>=0.7",
52-
"justbytes>=0.14",
53-
"packaging",
54-
"psutil",
55-
"python-dateutil",
56-
"wcwidth",
57-
],
58-
package_dir={"": "src"},
59-
packages=setuptools.find_packages("src"),
60-
scripts=["bin/stratis"],
61-
)
8+
setuptools.setup()

‎src/stratis_cli/_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
.. moduleauthor:: mulhern <amulhern@redhat.com>
1818
"""
1919

20-
__version_info__ = (3, 5, 1)
20+
__version_info__ = (3, 5, 2)
2121
__version__ = ".".join(str(x) for x in __version_info__)

0 commit comments

Comments
 (0)