new: dev: update to debian packaging files from packages.debian.org

* remove setuptools_scm toml feature and bump build-system requires
* note setuptools versions greater than 59 are only available for
  py37 and higher while minimum required for setuptools_scm is 61
  while setuptools_scm 8 is also too high for py37
* make sure debian control file depends on python3-setuptools-scm
  because it gets parsed by deb-helper scripts
* update rules file for proper cleaning and deselect CLI tests
* fix even more typos and remove superflous MANIFEST.in file
* make sure debian pkg workflow gets a compliant tag version

Signed-off-by: Stephen L Arnold <sarnold@vctlabs.com>

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, macos-latest]
-        python-version: [3.6, 3.8, '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.10', '3.11']
     steps:
     - name: Set git crlf/eol
       run: |

.github/workflows/debs.yml

@@ -39,7 +39,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install devscripts
-          debchange -v "`git describe --tags | sed -e "s|v||"`-${{ matrix.dist }}" -b -M --distribution ${{ matrix.dist }} "ci build"
+          debchange -v "`git describe --tags | sed -e "s|v||" -e "s|-g|+g|"`-${{ matrix.dist }}" -b -M --distribution ${{ matrix.dist }} "ci build"
 
       - name: Build deb packages
         uses: jtdor/build-deb-action@v1

.github/workflows/release.yml

@@ -52,6 +52,12 @@ jobs:
         python -m pip install --upgrade pip wheel
         pip install tox tox-gh-actions
 
+    - name: Run tests
+      run: |
+        tox -- --slow
+      env:
+        PLATFORM: ${{ matrix.os }}
+
     - name: Build dist pkgs
       run: |
         tox -e build

.github/workflows/wheels.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, macos-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
 
     steps:
       - name: Set git crlf/eol

debian/.debhelper/generated/bmap-tools/installed-by-dh_installman

@@ -0,0 +1 @@
+./docs/man1/bmaptool.1

debian/changelog

@@ -1,38 +1,191 @@
-bmap-tools (3.7) unstable; urgency=low
+bmap-tools (3.7-1) unstable; urgency=medium
+
+  * New upstream release
+    - This uses python3-gpg, replacing python3-gpgme (Closes: #876983)
+    - The --psplash option should now work (Closes: #1034290)
+  * d/clean: Fix FTBFS-twice-in-a-row by removing generated egg-info
+    directory (Closes: #1044027)
+  * Add Provides on bmaptool, reflecting the name of the tool in /usr/bin
+    (Closes: #1032062)
+  * d/patches: Drop all patches, included in new upstream release
+  * d/control: Build using pyproject
+  * d/rules: Update build system overrides
+  * d/p/pyproject.toml-Move-nose-from-dependencies-to-dev-depende.patch:
+    Add proposed patch to remove unnecessary python3-nose runtime dependency
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 18 Sep 2023 10:58:00 +0100
+
+bmap-tools (3.6-2) unstable; urgency=medium
+
+  [ Debian Janitor ]
+  * Remove version constraints unnecessary since buster (oldstable)
+
+  [ Simon McVittie ]
+  * Update standards version to 4.6.2, no changes needed.
+
+ -- Simon McVittie <smcv@debian.org>  Sun, 22 Jan 2023 12:42:44 +0000
+
+bmap-tools (3.6-1) unstable; urgency=medium
+
+  * New upstream release
+  * d/p/test_api_base-Skip-test-if-filesystem-is-unsuitable.patch,
+    d/p/Filemap-catch-StopIteration-from-next-iterator.patch:
+    Drop previous patches, applied upstream
+  * d/p/Correct-parameter-name-when-documenting-psplash-pipe-in-t.patch,
+    d/p/Expand-documentation-of-psplash-pipe-to-specify-what-is-r.patch:
+    Add patches to fix documentation of --psplash-pipe
+  * d/p/TransRead-kill-subprocesses.patch,
+    d/p/Do-not-use-subprocess-pipe.patch,
+    d/p/TransRead-hide-useless-message.patch,
+    d/p/tests-fix-test_bmap_helpers-on-non-ZFS.patch:
+    Add patches from upstream to fix unit test issues
+  * d/p/tests-Use-unittest.mock-from-Python-standard-library-if-p.patch,
+    d/p/tests-Try-to-use-TemporaryDirectory-from-Python-standard-.patch,
+    d/p/tests-Fix-import-pattern-for-mock-objects.patch:
+    Add patches to avoid unnecessary external dependencies
+  * d/p/tests-Pass-c-k-options-to-zstd-too.patch:
+    Add patch to fix test failure
+  * Use debhelper compat level 13
+  * Standards-Version: 4.6.0 (no changes required)
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 28 Oct 2021 12:49:16 +0100
+
+bmap-tools (3.5-3) unstable; urgency=medium
+
+  * Standards-Version: 4.5.0 (no changes required)
+  * d/salsa-ci.yml: Request standard CI on salsa.debian.org
+  * d/p/test_api_base-Skip-test-if-filesystem-is-unsuitable.patch:
+    Skip tests if the filesystem cannot support them, for example when
+    building on disorderfs
+  * Mark both patches as applied upstream
+  * Use debhelper-compat 12
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+    Repository-Browse
+  * Canonicalize case of Upstream-Name in d/copyright
+  * Fix day-of-week for changelog entry 0.1.0
+  * Standards-Version: 4.5.1 (no changes required)
+  * Set development branch to debian/latest
+  * d/tests/smoke: Remove compatibility with old autopkgtest versions
+  * debian/tests: Update test web server from Flatpak
+
+ -- Simon McVittie <smcv@debian.org>  Sat, 19 Dec 2020 14:50:10 +0000
+
+bmap-tools (3.5-2) unstable; urgency=medium
+
+  * d/p/Filemap-catch-StopIteration-from-next-iterator.patch:
+    Fix FTBFS with Python 3.7 (Closes: #915686)
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 10 Dec 2018 15:43:52 +0000
+
+bmap-tools (3.5-1) unstable; urgency=medium
+
+  * New upstream release
+    - Drop all patches, applied upstream
+    - Silences warnings with blk-mq (Closes: #906328)
+  * Depend and build-depend on python3-six
+  * Remove unnecessary XS-Python-Version. python3 versions < 3.3 are
+    no longer supported in any supported Debian release, and in any case
+    this was the wrong field (it should have been X-Python3-Version).
+  * d/watch: Download GitHub's autogenerated archive files since upstream
+    no longer releases a canonical signed tarball
+  * Install upstream release notes as NEWS.gz (Policy §12.7)
+  * Standards-Version: 4.2.1 (no further changes required)
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 28 Sep 2018 10:19:41 +0100
+
+bmap-tools (3.4-2) unstable; urgency=medium
+
+  * Standards-Version: 4.1.4 (no changes required)
+  * Add proposed patches from upstream pull requests to fix image
+    downloading under Python 3 (Closes: #896182) and to fix downloading
+    compressed files
+  * debian/tests: Add a simple autopkgtest
+  * debian/gbp.conf: Don't put a numbered prefix on patches
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 25 Apr 2018 20:47:22 +0100
+
+bmap-tools (3.4-1) unstable; urgency=medium
+
+  * New upstream release
+    - Drop all patches, applied upstream
+    - Suggest lz4 and unzip for newly-supported decompressors
+    - d/copyright: Update
+  * Update Vcs-* for move to salsa.debian.org
+  * Standards-Version: 4.1.3 (no changes required)
+  * d/gbp.conf: Merge from upstream VCS tags
+  * d/watch, Homepage, Source: Follow new upstream location
+  * Use Python 3 now that upstream supports it (Closes: #830877)
+  * Demote python3-gpgme from Recommends to Suggests
+  * Use pybuild
+  * d/p/BmapHelpers.py-fix-Errno-25-Inappropriate-ioctl-for-devic.patch,
+    d/p/Fix-errno-usage.patch:
+    Apply some post-release bug fixes from upstream git
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 26 Feb 2018 09:13:43 +0000
+
+bmap-tools (3.2-6) unstable; urgency=medium
+
+  * Standards-Version: 4.1.1
+    - d/copyright: Use https URL for Format
+  * Rules-Requires-Root: no
+  * Move to debhelper compat level 10
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 30 Oct 2017 21:08:06 +0000
+
+bmap-tools (3.2-5) unstable; urgency=medium
+
+  * d/p/*-TransRead-Fix-differentiating-between-local-files-an.patch:
+    - Added. Fix downloads from https (Closes: #831655)
+  * Add myself to Uploaders
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Fri, 11 Nov 2016 15:17:42 +0100
+
+bmap-tools (3.2-4) unstable; urgency=medium
+
+  * Switch Vcs-Git to https (see #810378)
+  * Switch Vcs-Browser to https and cgit
+  * Standards-Version: 3.9.8 (no changes needed)
+  * Use DEP-14 branch names debian/master, upstream/latest
+  * Downgrade all decompressors (bzip2, lzop, xz-utils) to Recommends.
+    Each decompressor is only used when operating on the relevant file
+    format, so none are hard dependencies.
+  * debian/control: normalize via "wrap-and-sort -abst"
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 07 Jul 2016 09:44:04 +0100
+
+bmap-tools (3.2-3) unstable; urgency=high
+
+  * Downgrade python-gpgme from Depends to Recommends. It is only
+    used if the bmap file comes with a detached signature, and is
+    conditionally imported. It seems pygpgme is in danger of being removed
+    from Debian testing, and it would be good to avoid losing bmap-tools.
+  * Standards-Version: 3.9.6 (no changes needed)
+  * Build-depend on dh-python
+  * Release with high urgency to get it into testing before pygpgme is
+    removed
 
-  * Use GitHub Actions for CI (#109)
-  * Add `poetry` for dependency management and `black` for code formatting
-    (#104)
-  * Add functionality for copying from standard input (#99)
-  * Switch from gpg to gpgme module (#103)
+ -- Simon McVittie <smcv@debian.org>  Wed, 13 Jan 2016 20:15:15 +0000
 
- -- Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Wed, 02 Aug 2023 15:11:26 +0300
+bmap-tools (3.2-2) unstable; urgency=medium
 
-bmap-tools (3.6) unstable; urgency=low
+  * Add patch to make the child process for transparent uncompression
+    read the compressed file directly if possible, avoiding blocking
+    forever in join() if the read thread does not terminate
 
-  * Improve ZFS compatibility.
-  * Added the 'zstd' compression type support.
-  * Add '--psplash-pipe' option for interacting with psplash.
+ -- Simon McVittie <smcv@debian.org>  Tue, 03 Jun 2014 15:37:17 +0100
 
- -- Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Tue, 02 Feb 2021 14:08:41 +0200
+bmap-tools (3.2-1) unstable; urgency=low
 
-bmap-tools (3.5) unstable; urgency=low
+  * New upstream release
+  * Correct debian/changelog syntax in entries from upstream
+  * Add some patches from upstream to improve the man page
+  * Remove python-lzma from Depends, no longer used
+  * Adjust dependencies on (de)compressors:
+    - do not explicitly depend on gzip or tar, they're already Essential: yes
+    - demote pbzip2 and pigz to Suggests, they're not strictly necessary
+  * Standards-Version: 3.9.5 (no changes needed)
 
-  * Fixed copying of compressed files from URLs
-  * Python 3.x support fixes and improvements.
-
- -- Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Thu, 23 Aug 2018 10:34:31 +0300
-
-bmap-tools (3.4) unstable; urgency=low
-
-  * New homepage: https://github.com/01org/bmap-tools
-  * Python 3.x support.
-  * bmaptool can now be shipped as standalone application.
-  * Added support for ZIP archives.
-  * Added support for LZ4 archives.
-  * Fixed bugs related to specific filesystems.
-
- -- Alexander Kanevskiy <kad@linux.intel.com>  Thu, 31 Aug 2017 15:40:12 +0300
+ -- Simon McVittie <smcv@debian.org>  Sun, 09 Mar 2014 13:25:56 +0000
 
 bmap-tools (3.2) unstable; urgency=low
 
@@ -74,6 +227,17 @@ bmap-tools (2.6) unstable; urgency=low
 
  -- Artem Bityutskiy <artem.bityutskiy@linux.intel.com>  Tue, 13 Aug 2013 14:53:49 +0300
 
+bmap-tools (2.5-1) unstable; urgency=low
+
+  * Initial release to Debian (Closes: #714280)
+  * Set myself as Debian maintainer
+  * Add debian/gbp.conf
+  * Add debian/source/format
+  * Add debian/watch
+  * Standards-Version: 3.9.4 (no changes needed)
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 19 Aug 2013 15:30:58 +0100
+
 bmap-tools (2.5) unstable; urgency=low
 
   * Do not fail when lacking permisssions for accessing block device's sysfs
@@ -222,4 +386,4 @@ bmap-tools (0.1.0) unstable; urgency=low
 
   * Initial release.
 
- -- Ed Bartosh <eduard.bartosh@intel.com>  Sun, 27 Oct 2012 22:31:28 +0300
+ -- Ed Bartosh <eduard.bartosh@intel.com>  Sat, 27 Oct 2012 22:31:28 +0300

debian/clean

@@ -0,0 +1 @@
+bmap_tools.egg-info/

debian/control

@@ -1,35 +1,47 @@
 Source: bmap-tools
-Maintainer: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+Maintainer: Simon McVittie <smcv@debian.org>
+Uploaders: Sjoerd Simons <sjoerd@debian.org>
 Section: utils
 Priority: optional
-Build-Depends: debhelper (>= 9),
-               python3-all (>= 3.6),
-               python3-setuptools,
-               python3-defusedxml,
-               python3-setuptools-scm-git-archive,
-Standards-Version: 3.8.4
-XS-Python-Version: >= 3.6
+Build-Depends:
+ debhelper-compat (= 10),
+ dh-python,
+ python3,
+ python3-gpg,
+ python3-six,
+ python3-setuptools,
+ python3-defusedxml,
+ python3-setuptools-scm,
+ python3-all-dev,
+ python3-pytest,
+Standards-Version: 4.6.2
+Vcs-Git: https://salsa.debian.org/debian/bmap-tools.git
+Vcs-Browser: https://salsa.debian.org/debian/bmap-tools
+Rules-Requires-Root: no
+Homepage: https://github.com/intel/bmap-tools
 
 Package: bmap-tools
 Architecture: all
-Depends: python3 (>=3.6),
-         python3-gpgme,
-         ${misc:Depends},
-         ${python:Depends},
-         libgpgme-dev,
-         bzip2,
-         pbzip2,
-         gzip,
-         pigz,
-         lzop,
-         liblz4-tool,
-         xz-utils,
-         tar,
-         unzip,
-         zstd
-Description: Tools to generate block map (AKA bmap) and flash images using
- bmap. Bmaptool is a generic tool for creating the block map (bmap) for a file,
- and copying files using the block map. The idea is that large file containing
- unused blocks, like raw system image files, can be copied or flashed a lot
- faster with bmaptool than with traditional tools like "dd" or "cp". See
- source.tizen.org/documentation/reference/bmaptool for more information.
+Depends:
+ python3,
+ python3-six,
+ ${misc:Depends},
+ ${python3:Depends},
+Recommends:
+ bzip2,
+ lzop,
+ xz-utils,
+Suggests:
+ lz4,
+ pbzip2,
+ pigz,
+ python3-gpg,
+ unzip,
+Provides:
+ bmaptool (= ${binary:Version}),
+Description: tool to flash image files to block devices using the block map
+ bmaptool is a generic tool for creating the block map (bmap) for a
+ file, and copying files using the block map. The idea is that large
+ file containing unused blocks, like raw system image files, can be
+ copied or flashed a lot faster with bmaptool than with traditional
+ tools like "dd" or "cp".