Merge pull request #843 from mulkieran/develop-2.4.1-3.0.0

Version 3.0.0

.github/workflows/main.yml

@@ -6,11 +6,23 @@ on:
   push:
     branches:
       - master
-      - develop-2.4.0
+      - develop-2.4.1
+    paths-ignore:
+      - 'CHANGES.txt'
+      - '**/README.rst'
+      - 'LICENSE'
+      - 'docs/**'
+      - 'shell-completion/**'
   pull_request:
     branches:
       - master
-      - develop-2.4.0
+      - develop-2.4.1
+    paths-ignore:
+      - 'CHANGES.txt'
+      - '**/README.rst'
+      - 'LICENSE'
+      - 'docs/**'
+      - 'shell-completion/**'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -21,55 +33,104 @@ jobs:
       matrix:
         include:
           # MANDATORY CHECKS USING CURRENT DEVELOPMENT INTERPRETER
-          - python-version: 3.8.6
-            dependencies: >
-              pylint==2.4.4
-              dbus-client-gen==0.4
-              dbus-python-client-gen==0.7
-              justbytes==0.11
-              python-dateutil==2.8.0
-              wcwidth==0.2.4
-              psutil==5.6.7
-              semantic_version==2.8.4
-            task: PYTHONPATH=./src make -f Makefile lint
-          - python-version: 3.8.6
-            dependencies: black==20.8b1 isort==4.3.21
-            task: make -f Makefile fmt-travis
-          - python-version: 3.8.6
-            dependencies: >
-              dbus-client-gen==0.4
-              dbus-python-client-gen==0.7
-              justbytes==0.11
-              python-dateutil==2.8.0
-              wcwidth==0.2.4
-              psutil==5.6.7
-              semantic_version==2.8.4
-            task: PYTHONPATH=./src make -f Makefile test-travis
-          # MANDATORY CHECKS USING LOWEST SUPPORTED INTERPRETER
-          - python-version: 3.6.8
-            dependencies: >
-              pylint==2.4.4
-              dbus-client-gen==0.4
-              dbus-python-client-gen==0.7
-              justbytes==0.11
-              python-dateutil==2.6.1
-              psutil==5.4.3
-              semantic_version==2.6.0
+          - dependencies: >
+              pylint
+              python3-dateutil
+              python3-dbus-client-gen
+              python3-dbus-python-client-gen
+              python3-justbytes
+              python3-packaging
+              python3-psutil
+              python3-wcwidth
             task: PYTHONPATH=./src make -f Makefile lint
+          - dependencies: black python3-isort
+            task: make -f Makefile fmt-ci
           # VERIFICATION OF TEST INFRASTRUCTURE
-          - python-version: 3.8.6
-            dependencies: yamllint==1.26.0
+          - dependencies: yamllint
             task: make -f Makefile yamllint
     runs-on: ubuntu-18.04
+    container: fedora:34  # CURRENT DEVELOPMENT ENVIRONMENT
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
       - name: Install dependencies
-        run: |
-          sudo apt-get -q update
-          sudo apt-get -y install libdbus-glib-1-dev
-          pip3 install ${{ matrix.dependencies }}
+        run: >
+          dnf install -y
+          make
+          python-unversioned-command
+          ${{ matrix.dependencies }}
+      - name: Display Python version
+        run: python --version
       - name: Run test
         run: ${{ matrix.task }}
+
+  test-runs:
+    strategy:
+      matrix:
+        include:
+          # MANDATORY CHECKS USING CURRENT DEVELOPMENT ENVIRONMENT
+          - task: make -f Makefile all-tests
+            rust_log: RUST_LOG=stratisd=debug
+            image: fedora:34  # CURRENT DEVELOPMENT ENVIRONMENT
+            additional_dependencies: >
+              python3-wcwidth
+          - task: make -f Makefile coverage-no-html
+            rust_log:
+            image: fedora:34  # CURRENT DEVELOPMENT ENVIRONMENT
+            additional_dependencies: >
+              python3-wcwidth
+          # MANDATORY CHECKS USING LOWEST SUPPORTED ENVIRONMENT PROXY
+          - task: make -f Makefile all-tests
+            rust_log: RUST_LOG=stratisd=debug
+            image: fedora:30  # LOWEST DEVELOPMENT ENVIRONMENT
+            additional_dependencies:
+    runs-on: ubuntu-18.04
+    container: ${{ matrix.image }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: >
+          dnf install -y
+          asciidoc
+          clang
+          cryptsetup-devel
+          dbus-daemon
+          dbus-tools
+          dbus-devel
+          libblkid-devel
+          git
+          make
+          python3-coverage
+          python3-dbus-client-gen
+          python3-dbus-python-client-gen
+          python3-justbytes
+          python3-dateutil
+          python3-packaging
+          python3-psutil
+          systemd-devel
+          ${{ matrix.additional_dependencies }}
+      - uses: actions-rs/toolchain@v1
+        with:
+          components: cargo
+          toolchain: 1.54.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          override: true
+      - name: Check out stratisd
+        run: git clone https://github.com/stratis-storage/stratisd.git
+      - name: Build stratisd
+        run: PROFILEDIR=debug make install
+        working-directory: ./stratisd
+      - name: Set up for D-Bus
+        run: |
+          mkdir -p /var/lib/dbus
+          dbus-uuidgen > /var/lib/dbus/machine-id
+          mkdir -p /var/run/dbus
+      - name: Start D-Bus
+        run: >
+          dbus-daemon
+          --config-file=/usr/share/dbus-1/system.conf
+          --print-address
+      - name: Run test
+        run: >
+          ${{ matrix.rust_log }}
+          STRATISD=/usr/libexec/stratisd
+          PYTHONPATH=./src
+          ${{ matrix.task }}

.github/workflows/weekly.yml

@@ -0,0 +1,43 @@
+---
+name: stratis-cli weekly
+
+# yamllint disable-line rule:truthy
+on:
+  schedule:
+    - cron: 25 3 * * 4
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  next-fedora-python-checks:
+    continue-on-error: true
+    strategy:
+      matrix:
+        include:
+          # PYTHON CHECKS ON NEXT FEDORA PYTHON AND PYTHON TOOLS VERSION
+          - dependencies: >
+              pylint
+              python3-dateutil
+              python3-dbus-client-gen
+              python3-dbus-python-client-gen
+              python3-justbytes
+              python3-packaging
+              python3-psutil
+              python3-wcwidth
+            task: PYTHONPATH=./src make -f Makefile lint
+          - dependencies: black python3-isort
+            task: make -f Makefile fmt-ci
+          - dependencies: yamllint
+            task: make -f Makefile yamllint
+    runs-on: ubuntu-18.04
+    container: fedora:34  # NEXT DEVELOPMENT ENVIRONMENT
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: >
+          dnf install -y
+          make
+          python-unversioned-command
+          ${{ matrix.dependencies }}
+      - name: ${{ matrix.task }}
+        run: ${{ matrix.task }}

.isort.cfg

@@ -6,7 +6,6 @@ use_parentheses=True
 line_length=88
 
 sections = FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCAL,LOCALFOLDER
-default_section=THIRDPARTY
 
 import_heading_future=isort: FUTURE
 import_heading_stdlib=isort: STDLIB

CHANGES.txt

@@ -1,3 +1,86 @@
+stratis-cli 3.0.0
+=================
+Required stratisd version: 3.0.0
+
+Recommended development environment: Fedora 34
+Lowest supported Python interpreter: 3.6.8
+
+- Bump stratisd required version to 3.0:
+  https://github.com/stratis-storage/stratis-cli/pull/836
+  https://github.com/stratis-storage/stratis-cli/pull/835
+  https://github.com/stratis-storage/stratis-cli/pull/810
+  https://github.com/stratis-storage/stratis-cli/pull/809
+  https://github.com/stratis-storage/stratis-cli/pull/806
+
+- Drop dependency on FetchProperties D-Bus interface:
+  https://github.com/stratis-storage/stratis-cli/issues/838
+  https://github.com/stratis-storage/stratis-cli/pull/839
+
+- Make dependency on psutil optional:
+  https://github.com/stratis-storage/stratis-cli/issues/798
+  https://github.com/stratis-storage/stratis-cli/pull/820
+  https://github.com/stratis-storage/stratis-cli/pull/812
+
+- Display an Alerts column in pool listing:
+  https://github.com/stratis-storage/stratis-cli/pull/823
+
+- Extend filesystem listing to show filesystem size:
+  https://github.com/stratis-storage/stratis-cli/issues/832
+  https://github.com/stratis-storage/stratis-cli/pull/833
+  https://github.com/stratis-storage/stratis-cli/pull/830
+
+- Add support for rebinding with Clevis and with a key in the kernel keyring:
+  https://github.com/stratis-storage/stratis-cli/issues/776
+  https://github.com/stratis-storage/stratis-cli/pull/805
+
+- Allow setting filesystem size on filesystem creation:
+  https://github.com/stratis-storage/stratis-cli/pull/822
+
+- Update D-Bus API revision numbers:
+  https://github.com/stratis-storage/stratis-cli/pull/777
+
+- No longer track error codes that stratisd no longer reports:
+  https://github.com/stratis-storage/stratis-cli/pull/799
+
+- Use packaging instead of semantic_version:
+  https://github.com/stratis-storage/stratis-cli/issues/803
+  https://github.com/stratis-storage/stratis-cli/issues/807
+  https://github.com/stratis-storage/stratis-cli/pull/825
+  https://github.com/stratis-storage/stratis-cli/pull/785
+
+- Document the UUID column for pool listing in the man pages:
+  https://github.com/stratis-storage/stratis-cli/pull/817
+
+- Tidies and Maintenance:
+  https://github.com/stratis-storage/stratis-cli/pull/842
+  https://github.com/stratis-storage/stratis-cli/pull/841
+  https://github.com/stratis-storage/stratis-cli/pull/834
+  https://github.com/stratis-storage/stratis-cli/pull/831
+  https://github.com/stratis-storage/stratis-cli/pull/829
+  https://github.com/stratis-storage/stratis-cli/pull/828
+  https://github.com/stratis-storage/stratis-cli/pull/827
+  https://github.com/stratis-storage/stratis-cli/pull/826
+  https://github.com/stratis-storage/stratis-cli/pull/824
+  https://github.com/stratis-storage/stratis-cli/pull/819
+  https://github.com/stratis-storage/stratis-cli/pull/818
+  https://github.com/stratis-storage/stratis-cli/pull/815
+  https://github.com/stratis-storage/stratis-cli/pull/802
+  https://github.com/stratis-storage/stratis-cli/pull/801
+  https://github.com/stratis-storage/stratis-cli/pull/797
+  https://github.com/stratis-storage/stratis-cli/pull/796
+  https://github.com/stratis-storage/stratis-cli/pull/782
+  https://github.com/stratis-storage/stratis-cli/pull/781
+  https://github.com/stratis-storage/stratis-cli/pull/780
+  https://github.com/stratis-storage/stratis-cli/pull/778
+  https://github.com/stratis-storage/stratis-cli/pull/775
+  https://github.com/stratis-storage/stratis-cli/pull/774
+  https://github.com/stratis-storage/stratis-cli/pull/773
+  https://github.com/stratis-storage/stratis-cli/pull/770
+  https://github.com/stratis-storage/stratis-cli/pull/768
+  https://github.com/stratis-storage/stratis-cli/pull/767
+  https://github.com/stratis-storage/stratis-cli/pull/766
+
+
 stratis-cli 2.4.1
 =================
 
@@ -14,6 +97,7 @@ stratis-cli 2.4.1
   https://github.com/stratis-storage/stratis-cli/pull/756
 
 - Tidies and Maintenance:
+  https://github.com/stratis-storage/stratis-cli/pull/764
   https://github.com/stratis-storage/stratis-cli/pull/760
   https://github.com/stratis-storage/stratis-cli/pull/757
   https://github.com/stratis-storage/stratis-cli/pull/753

Makefile

@@ -2,22 +2,20 @@ UNITTEST_OPTS = --verbose
 
 .PHONY: lint
 lint:
-	./check.py check.py
-	./check.py setup.py
-	./check.py developer_tools/update_introspection_data
-	./check.py bin/stratis
-	./check.py src/stratis_cli
-	./check.py tests/whitebox
+	pylint setup.py
+	pylint bin/stratis
+	pylint src/stratis_cli --disable=duplicate-code --ignore=_introspect.py
+	pylint tests/whitebox --disable=duplicate-code
 
 .PHONY: fmt
 fmt:
-	isort --recursive check.py setup.py bin/stratis developer_tools src tests
-	black ./bin/stratis ./developer_tools/update_introspection_data .
+	isort setup.py bin/stratis src tests
+	black ./bin/stratis .
 
-.PHONY: fmt-travis
-fmt-travis:
-	isort --recursive --diff --check-only check.py setup.py bin/stratis developer_tools src tests
-	black ./bin/stratis ./developer_tools/update_introspection_data . --check
+.PHONY: fmt-ci
+fmt-ci:
+	isort --diff --check-only setup.py bin/stratis src tests
+	black ./bin/stratis . --check
 
 PYREVERSE_OPTS = --output=pdf
 .PHONY: view
@@ -32,15 +30,7 @@ view:
 	pyreverse ${PYREVERSE_OPTS} --project="test-whitebox" tests/whitebox/_misc.py -a 1
 	mv classes_test-whitebox.pdf _pyreverse
 
-.PHONY: archive
-archive:
-	git archive --output=./stratis_cli.tar.gz HEAD
-
-.PHONY: upload-release
-upload-release:
-	python setup.py register sdist upload
-
-.PHONY: docs
+.PHONY: api-docs
 api-docs:
 	sphinx-apidoc-3 -P -F -o api src/stratis_cli
 	sphinx-build-3 -b html api api/_build/html
@@ -70,8 +60,12 @@ keyboard-interrupt-test:
 stratisd-version-test:
 	python3 -m unittest ${UNITTEST_OPTS} tests.whitebox.monkey_patching.test_stratisd_version.StratisdVersionTestCase
 
-test-travis: unittest-tests
+.PHONY: sim-tests
+sim-tests: dbus-tests keyboard-interrupt-test stratisd-version-test
+
+.PHONY: all-tests
+all-tests: unittest-tests sim-tests
 
 .PHONY: yamllint
 yamllint:
-	yamllint --strict .github/workflows/main.yml
+	yamllint --strict .github/workflows/*.yml