[med-svn] [Git][python-team/packages/python-schema-salad][master] 6 commits: d/rules: use DEB_BUILD_OPTION_PARALLEL instead of "auto" for setting the...
Michael R. Crusoe (@crusoe)
gitlab at salsa.debian.org
Tue Apr 8 18:26:00 BST 2025
Michael R. Crusoe pushed to branch master at Debian Python Team / packages / python-schema-salad
Commits:
76e88f2c by Michael R. Crusoe at 2025-01-30T11:04:11+01:00
d/rules: use DEB_BUILD_OPTION_PARALLEL instead of "auto" for setting the amount of parallel testing.
- - - - -
7b9c8ed0 by Michael R. Crusoe at 2025-01-30T13:06:28+01:00
Clean up test invocation in d/rules and switch to autopkgtest-pkg-pybuild.
- - - - -
bcdad172 by Michael R. Crusoe at 2025-01-30T13:06:28+01:00
docs: link to other packages docs as well.
- - - - -
0f3805cf by Michael R. Crusoe at 2025-01-30T13:06:28+01:00
d/control: build-dep on graphviz for the docs.
- - - - -
40a03843 by Michael R. Crusoe at 2025-01-30T13:06:28+01:00
d/lintian-overrides: freshen
- - - - -
2b53f516 by Michael R. Crusoe at 2025-04-08T19:25:26+02:00
Skip "test_detect_changes_in_html", only of interest to developers. Closes: #1101866.
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/lintian-overrides
- + debian/patches/intersphinx
- debian/patches/series
- debian/rules
- − debian/tests/control
- − debian/tests/run-tests
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+python-schema-salad (8.8.20241206093842-3) UNRELEASED; urgency=medium
+
+ * d/rules: use DEB_BUILD_OPTION_PARALLEL instead of "auto" for setting
+ the amount of parallel testing.
+ * Clean up test invocation in d/rules and switch to autopkgtest-pkg-pybuild.
+ * docs: link to other packages docs as well.
+ * d/control: build-dep on graphviz for the docs.
+ * d/lintian-overrides: freshen
+ * Skip "test_detect_changes_in_html", only of interest to developers.
+ Closes: #1101866.
+
+ -- Michael R. Crusoe <crusoe at debian.org> Thu, 30 Jan 2025 11:04:04 +0100
+
python-schema-salad (8.8.20241206093842-2) unstable; urgency=medium
* Build the docs.
=====================================
debian/control
=====================================
@@ -34,12 +34,14 @@ Build-Depends: debhelper-compat (= 13),
python3-sphinxcontrib.autoprogram <!nodoc>,
python3-doc <!nodoc>,
python-rdflib-doc <!nodoc>,
- python-requests-doc <!nodoc>
+ python-requests-doc <!nodoc>,
+ graphviz <!nodoc>
Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/python-team/packages/python-schema-salad
Vcs-Git: https://salsa.debian.org/python-team/packages/python-schema-salad.git
Homepage: https://schema-salad.readthedocs.io/
Rules-Requires-Root: no
+Testsuite: autopkgtest-pkg-pybuild
Package: python3-schema-salad
Architecture: any
=====================================
debian/lintian-overrides
=====================================
@@ -1 +1,4 @@
-package-contains-documentation-outside-usr-share-doc usr/lib/python3/dist-packages/schema_salad/*
+# These are test data
+package-contains-documentation-outside-usr-share-doc [usr/lib/python3/dist-packages/schema_salad/*]
+# Common false-positive with mypyc Python extensions
+shared-library-lacks-prerequisites [usr/lib/python3/dist-packages/schema_salad/*.so]
=====================================
debian/patches/intersphinx
=====================================
@@ -0,0 +1,18 @@
+Author: Michael R. Crusoe <crusoe at debian.org>
+Description: Link to the packaged docs.
+Forwarded: not-needed
+--- python-schema-salad.orig/docs/conf.py
++++ python-schema-salad/docs/conf.py
+@@ -49,9 +49,9 @@
+ autosectionlabel_prefix_document = True
+
+ intersphinx_mapping = {
+- "python": ("https://docs.python.org/3", None),
+- "rdflib": ("https://rdflib.readthedocs.io/en/latest/", None),
+- "requests": ("https://requests.readthedocs.io/en/latest/", None),
++ "python": ("/usr/share/doc/python3/html/", None),
++ "rdflib": ("/usr/share/doc/python-rdflib-doc/html/", None),
++ "requests": ("/usr/share/doc/python-requests-doc/html/", None),
+ #"ruamel.yaml": ("https://yaml.readthedocs.io/en/stable/", None),
+ }
+
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
debug_binaries
better_is_fs_case_sensitive
typescript_license
+intersphinx
=====================================
debian/rules
=====================================
@@ -2,13 +2,12 @@
DH_VERBOSE := 1
-include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/default.mk
export PYBUILD_NAME=schema-salad
-#export PYBUILD_DISABLE=test
+export PYBUILD_TEST_ARGS=-rsfE $(DEB_BUILD_OPTION_PARALLEL:%=-n %) -k 'not (test_secondaryFiles or test_outputBinding or test_yaml_tab_error or test_bad_schemas or test_load_by_yaml_metaschema or test_detect_changes_in_html)' --pyargs schema_salad
export SCHEMA_SALAD_USE_MYPYC=1
export MYPYPATH=$(CURDIR)/mypy-stubs
-#export SETUPTOOLS_SCM_PRETEND_VERSION=${DEB_VERSION_UPSTREAM}
%:
dh $@ --buildsystem=pybuild
@@ -37,16 +36,6 @@ endif
sed -i 's/PYTHON/SCHEMA-SALAD-DOC/g' debian/schema-salad-doc.1
find . -name "*.coverage" -delete
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- dh_auto_install
- PYBUILD_SYSTEM=custom \
- PYBUILD_TEST_ARGS="cd {dir}; export PATH={destdir}/usr/bin:$$PATH ; \
- cd {build_dir}; export PYTHONPATH=$$(pwd); {interpreter} -m pytest \
- -rsfE -n auto -k 'not (test_secondaryFiles or test_outputBinding or test_yaml_tab_error or test_bad_schemas or test_load_by_yaml_metaschema)' \
- --pyargs schema_salad" dh_auto_test
-endif
-
execute_after_dh_auto_install:
find debian -name LICENSE -delete
find debian -name '*.cwl' -exec chmod a+x {} \;
=====================================
debian/tests/control deleted
=====================================
@@ -1,3 +0,0 @@
-Tests: run-tests
-Depends: @, python3-pytest-xdist, python3-pytest (>> 6.2), black
-Restrictions: allow-stderr, needs-internet
=====================================
debian/tests/run-tests deleted
=====================================
@@ -1,8 +0,0 @@
-#!/bin/sh -ex
-
-pkg=packagename
-if [ "$AUTOPKGTEST_TMP" = "" ] ; then
- AUTOPKGTEST_TMP=$(mktemp -d /tmp/${pkg}-test.XXXXXX)
-fi
-cd "$AUTOPKGTEST_TMP"
-py.test-3 -rs --numprocesses=auto --pyargs schema_salad
View it on GitLab: https://salsa.debian.org/python-team/packages/python-schema-salad/-/compare/901c7c581d2c3399f7e347b4d35da75af28346af...2b53f5167cd5c536b046df12871dce5980f2225c
--
View it on GitLab: https://salsa.debian.org/python-team/packages/python-schema-salad/-/compare/901c7c581d2c3399f7e347b4d35da75af28346af...2b53f5167cd5c536b046df12871dce5980f2225c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20250408/ccc2c448/attachment-0001.htm>
More information about the debian-med-commit
mailing list