!1 新增packaging sig组软件包

Merge pull request !1 from 苏芳/openkylin/yangtze
This commit is contained in:
苏芳 2023-03-21 06:55:40 +00:00 committed by cckylin-cibot
parent adcf5c754d
commit 3fa6fd3821
5 changed files with 80 additions and 0 deletions

24
debian/changelog vendored
View File

@ -1,3 +1,27 @@
python-werkzeug (2.2.2-ok5) yangtze; urgency=medium
* Update version info.
-- sufang <sufang@kylinos.cn> Tue, 21 Mar 2023 14:06:59 +0800
python-werkzeug (2.2.2-ok4) yangtze; urgency=medium
* Add python3-jinja2 to build-depends.
-- sufang <sufang@kylinos.cn> Tue, 14 Mar 2023 16:11:45 +0800
python-werkzeug (2.2.2-ok3) yangtze; urgency=medium
* Fix command 'install' has no such option 'install_layout'.
-- sufang <sufang@kylinos.cn> Tue, 14 Mar 2023 14:53:39 +0800
python-werkzeug (2.2.2-ok2) yangtze; urgency=medium
* Apply patch.
-- sufang <sufang@kylinos.cn> Tue, 14 Mar 2023 14:51:23 +0800
python-werkzeug (2.2.2-ok1) yangtze; urgency=medium
* Build for openkylin.

1
debian/control vendored
View File

@ -20,6 +20,7 @@ Build-Depends:
python3-sphinx-issues <!nodoc>,
python3-sphinxcontrib-log-cabinet <!nodoc>,
python3-watchdog <!nocheck>,
python3-jinja2
Homepage: http://werkzeug.pocoo.org/
Vcs-Git: https://gitee.com/openkylin/python-werkzeug.git
Vcs-Browser: https://gitee.com/openkylin/python-werkzeug

View File

@ -0,0 +1,53 @@
From: =?utf-8?b?6IuP6Iqz?= <sufang@kylinos.cn>
Date: Tue, 21 Mar 2023 06:55:40 +0000
Subject: =?utf-8?b?ITEg5paw5aKecGFja2FnaW5nIHNpZ+e7hOi9r+S7tuWMhSBNZXJnZSBw?=
=?utf-8?b?dWxsIHJlcXVlc3QgITEgZnJvbSDoi4/oirMvb3Blbmt5bGluL3lhbmd0emU=?=
---
tests/conftest.py | 10 ++++++++--
tests/test_serving.py | 10 ----------
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/tests/conftest.py b/tests/conftest.py
index 7ce0896..4b6c6cc 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -101,9 +101,15 @@ def dev_server(xprocess, request, tmp_path):
class Starter(ProcessStarter):
args = [sys.executable, run_path, name, json.dumps(kwargs)]
# Extend the existing env, otherwise Windows and CI fails.
- # Modules will be imported from tmp_path for the reloader.
+ # Modules will be imported from tmp_path for the reloader
+ # but any existing PYTHONPATH is preserved.
# Unbuffered output so the logs update immediately.
- env = {**os.environ, "PYTHONPATH": str(tmp_path), "PYTHONUNBUFFERED": "1"}
+ original_python_path = os.getenv("PYTHONPATH")
+ if original_python_path:
+ new_python_path = os.pathsep.join((original_python_path, str(tmp_path)))
+ else:
+ new_python_path = str(tmp_path)
+ env = {**os.environ, "PYTHONPATH": new_python_path, "PYTHONUNBUFFERED": "1"}
@cached_property
def pattern(self):
diff --git a/tests/test_serving.py b/tests/test_serving.py
index 0494828..ecdb15a 100644
--- a/tests/test_serving.py
+++ b/tests/test_serving.py
@@ -125,16 +125,6 @@ def test_windows_get_args_for_reloading(monkeypatch, tmp_path):
assert rv == argv
-@pytest.mark.parametrize("find", [_find_stat_paths, _find_watchdog_paths])
-def test_exclude_patterns(find):
- # Imported paths under sys.prefix will be included by default.
- paths = find(set(), set())
- assert any(p.startswith(sys.prefix) for p in paths)
- # Those paths should be excluded due to the pattern.
- paths = find(set(), {f"{sys.prefix}*"})
- assert not any(p.startswith(sys.prefix) for p in paths)
-
-
@pytest.mark.filterwarnings("ignore::pytest.PytestUnraisableExceptionWarning")
@pytest.mark.dev_server
def test_wrong_protocol(standard_app):

1
debian/patches/series vendored Normal file
View File

@ -0,0 +1 @@
0001-1-packaging-sig.patch

1
debian/rules vendored
View File

@ -8,6 +8,7 @@
export PYBUILD_NAME=werkzeug
export PYBUILD_TEST_PYTEST=1
export SETUPTOOLS_USE_DISTUTILS=stdlib
%:
dh $@ --with python3,sphinxdoc --buildsystem pybuild