Stefano Rivera pushed to branch master at Debian Python Team / packages /
python-schema-salad
Commits:
9941f7c4 by Stefano Rivera at 2023-06-16T12:31:06-04:00
Round-trip patches through PQ
- - - - -
8f6dd333 by Stefano Rivera at 2023-06-16T12:31:28-04:00
Patch: Allow cachecontrol 0.13 to be installed.
- - - - -
abdbaf0c by Stefano Rivera at 2023-06-16T12:45:35-04:00
Mark the autopkgtest as needs-internet.
- - - - -
c8ac9ed7 by Stefano Rivera at 2023-06-16T12:45:41-04:00
Upload to unstable
- - - - -
7 changed files:
- debian/changelog
- debian/patches/better_is_fs_case_sensitive
- + debian/patches/bump-cachecontrol
- debian/patches/rework_all
- debian/patches/series
- debian/patches/typescript_license
- debian/tests/control
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+python-schema-salad (8.4.20230213094415-2) unstable; urgency=medium
+
+ * Team upload.
+ * Patch: Allow cachecontrol 0.13 to be installed.
+ * Mark the autopkgtest as needs-internet.
+
+ -- Stefano Rivera <stefa...@debian.org> Fri, 16 Jun 2023 12:45:36 -0400
+
python-schema-salad (8.4.20230213094415-1) unstable; urgency=medium
* d/clean: expand to cover more leftovers
=====================================
debian/patches/better_is_fs_case_sensitive
=====================================
@@ -1,9 +1,17 @@
-From: Michael R. Crusoe <michael.cru...@gmail.com>
+From: "Michael R. Crusoe" <michael.cru...@gmail.com>
+Date: Fri, 16 Jun 2023 12:26:33 -0400
Subject: allow test to work post-installation
+
Forwarded: not-needed
---- python-schema-salad.orig/schema_salad/tests/test_ref_resolver.py
-+++ python-schema-salad/schema_salad/tests/test_ref_resolver.py
-@@ -20,9 +20,8 @@
+---
+ schema_salad/tests/test_ref_resolver.py | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/schema_salad/tests/test_ref_resolver.py
b/schema_salad/tests/test_ref_resolver.py
+index cfd48d4..8f53058 100644
+--- a/schema_salad/tests/test_ref_resolver.py
++++ b/schema_salad/tests/test_ref_resolver.py
+@@ -20,9 +20,8 @@ from schema_salad.tests.util import get_data
def is_fs_case_sensitive(
@@ -14,7 +22,7 @@ Forwarded: not-needed
return not os.path.exists(tmp_file.name.lower())
-@@ -179,7 +178,7 @@
+@@ -179,7 +178,7 @@ def test_import_list() -> None:
def test_fetch_inject_id() -> None:
path = get_data("tests/inject-id1.yml")
assert path
=====================================
debian/patches/bump-cachecontrol
=====================================
@@ -0,0 +1,22 @@
+From: Stefano Rivera <stefa...@debian.org>
+Date: Fri, 16 Jun 2023 12:29:59 -0400
+Subject: Permit cachecontral 0.13 to be installed
+
+Origin:
https://github.com/common-workflow-language/schema_salad/commit/96a0e58ce8fe90a9c7a93d20ffde3df8b451965d
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 5cfdfc5..b083e7e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -86,7 +86,7 @@ install_requires = [
+ "rdflib >= 4.2.2, < 7.0.0",
+ "rdflib-jsonld>=0.4.0, <= 0.6.1;python_version<='3.6'",
+ "mistune>=2.0.3,<2.1",
+- "CacheControl[filecache] >= 0.11.7, < 0.13",
++ "CacheControl[filecache] >= 0.11.7, < 0.14",
+ "mypy_extensions",
+ ]
+
=====================================
debian/patches/rework_all
=====================================
@@ -1,9 +1,17 @@
-From: Michael R. Crusoe <michael.cru...@gmail.com>
+From: "Michael R. Crusoe" <michael.cru...@gmail.com>
+Date: Fri, 16 Jun 2023 12:26:33 -0400
Subject: Adapt test for post-installation usage
+
Forwarded: not-needed
---- python-schema-salad.orig/schema_salad/tests/test_print_oneline.py
-+++ python-schema-salad/schema_salad/tests/test_print_oneline.py
-@@ -174,10 +174,9 @@
+---
+ schema_salad/tests/test_print_oneline.py | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/schema_salad/tests/test_print_oneline.py
b/schema_salad/tests/test_print_oneline.py
+index 18ed547..47fa401 100644
+--- a/schema_salad/tests/test_print_oneline.py
++++ b/schema_salad/tests/test_print_oneline.py
+@@ -174,10 +174,9 @@ def test_for_invalid_yaml2() -> None:
)
except ValidationException as e:
msg = str(e)
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
rework_all
better_is_fs_case_sensitive
typescript_license
+bump-cachecontrol
=====================================
debian/patches/typescript_license
=====================================
@@ -1,11 +1,17 @@
-Author: Michael R. Crusoe <cru...@debian.org>
-Description: Typescript codegen: Use local copy of the Apache 2.0 license
+From: "Michael R. Crusoe" <cru...@debian.org>
+Date: Fri, 16 Jun 2023 12:26:33 -0400
+Subject: Typescript codegen: Use local copy of the Apache 2.0 license
During Debian packaging the extra LICENSE file gets deleted
+---
+ schema_salad/typescript_codegen.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
---- python-schema-salad.orig/schema_salad/typescript_codegen.py
-+++ python-schema-salad/schema_salad/typescript_codegen.py
-@@ -745,7 +745,7 @@
+diff --git a/schema_salad/typescript_codegen.py
b/schema_salad/typescript_codegen.py
+index 9f6d19b..7986ac3 100644
+--- a/schema_salad/typescript_codegen.py
++++ b/schema_salad/typescript_codegen.py
+@@ -745,7 +745,7 @@ export enum {enum_name} {{
expand_resource_template_to("package.json", self.target_dir /
"package.json")
expand_resource_template_to(".gitignore", self.target_dir /
".gitignore")
=====================================
debian/tests/control
=====================================
@@ -1,3 +1,3 @@
Tests: run-tests
Depends: @, python3-pytest-xdist, python3-pytest (>> 6.2), black
-Restrictions: allow-stderr
+Restrictions: allow-stderr, needs-internet
View it on GitLab:
https://salsa.debian.org/python-team/packages/python-schema-salad/-/compare/bef577f0d1cfb8b2ee50790e2167e3814695e920...c8ac9ed78634c996d3674d08ab8b2a26453eedd9
--
View it on GitLab:
https://salsa.debian.org/python-team/packages/python-schema-salad/-/compare/bef577f0d1cfb8b2ee50790e2167e3814695e920...c8ac9ed78634c996d3674d08ab8b2a26453eedd9
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
debian-med-com...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
