[Git][reproducible-builds/diffoscope][master] 2 commits: Correct logic for supporting different versions of argcomplete.

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
90c51e85 by Chris Lamb at 2022-06-02T12:29:08+01:00
Correct logic for supporting different versions of argcomplete.

- - - - -
da5458ee by Chris Lamb at 2022-06-02T12:35:22+01:00
Correctly package diffoscope's scripts/ directory. (Closes: reproducible-builds/diffoscope#305)

- - - - -


5 changed files:

- MANIFEST.in
- debian/rules
- diffoscope/comparators/vmlinuz.py
- scripts/extract-vmlinux → diffoscope/scripts/extract-vmlinux
- setup.py


Changes:

=====================================
MANIFEST.in
=====================================
@@ -2,5 +2,4 @@ include COPYING
 include README.rst
 include CONTRIBUTING.md
 include pyproject.toml
-graft scripts
 graft tests


=====================================
debian/rules
=====================================
@@ -38,7 +38,7 @@ doc/%.1:
 	$(MAKE) -C doc $*.1
 
 debian/diffoscope-minimal.bash-completion:
-	register-python-argcomplete diffoscope || register-python-argcomplete3 diffoscope > $@
+	(register-python-argcomplete diffoscope || register-python-argcomplete3 diffoscope) > $@
 
 execute_after_dh_auto_build: debian/diffoscope-minimal.bash-completion
 	dh_auto_build -O--buildsystem=makefile -Ddoc


=====================================
diffoscope/comparators/vmlinuz.py
=====================================
@@ -46,7 +46,7 @@ class VmlinuzContainer(Archive):
         logger.debug("extracting vmlinuz to %s", dest_path)
 
         # Locate extract-vmlinux script
-        script = pathlib.Path(__file__).parent.parent.parent.joinpath(
+        script = pathlib.Path(__file__).parent.parent.joinpath(
             "scripts", "extract-vmlinux"
         )
         with open(dest_path, "wb") as f:


=====================================
scripts/extract-vmlinux → diffoscope/scripts/extract-vmlinux
=====================================


=====================================
setup.py
=====================================
@@ -45,6 +45,8 @@ setup(
     license="GPL-3+",
     url="https://diffoscope.org/",
     packages=find_packages(exclude=["tests", "tests.*"]),
+    package_data={"diffoscope": ["scripts/*"]},
+    include_package_data=True,
     tests_require=["pytest"],
     cmdclass={"test": PyTest},
     entry_points={



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/15548cb27de7ba001f6708b09690828857cab967...da5458ee0cd33d8bd8d45969d86572a9dcdc17e6

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/15548cb27de7ba001f6708b09690828857cab967...da5458ee0cd33d8bd8d45969d86572a9dcdc17e6
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20220602/989002f1/attachment.htm>