diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..58ef5ee
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+
+ doc
+
diff --git a/python-waitress.changes b/python-waitress.changes
index fbc28b7..b794438 100644
--- a/python-waitress.changes
+++ b/python-waitress.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Thu Oct 1 13:33:24 UTC 2020 - Hans-Peter Jansen
+
+- Update to version 1.4.4 (2020-06-01)
+ + Fix an issue with keep-alive connections in which memory usage
+ was higher than expected because output buffers were being
+ reused across requests on a long-lived connection and each
+ buffer would not be freed until it was full or the connection
+ was closed. Buffers are now rotated per-request to stabilize
+ their behavior.
+ + See https://github.com/Pylons/waitress/pull/300
+ + Waitress threads have been updated to contain their thread
+ number. This will allow loggers that use that information to
+ print the thread that the log is coming from.
+ + See https://github.com/Pylons/waitress/pull/302
+- Switch to pytest, disable one test, that requires network
+- Create _multibuild for doc package
+ It requires installation of base package now
+
-------------------------------------------------------------------
Wed Jun 17 08:40:18 UTC 2020 - Jacek Tomasiak
diff --git a/python-waitress.spec b/python-waitress.spec
index 167fa6e..cb3a6a1 100644
--- a/python-waitress.spec
+++ b/python-waitress.spec
@@ -16,9 +16,18 @@
#
+%global flavor @BUILD_FLAVOR@%{nil}
+
+%if "%{flavor}" == "doc"
+%define psuffix -doc
+%endif
+%if "%{flavor}" == ""
+%define psuffix %{nil}
+%endif
+
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name: python-waitress
-Version: 1.4.3
+Name: python-waitress%{psuffix}
+Version: 1.4.4
Release: 0
Summary: Waitress WSGI server
License: ZPL-2.1
@@ -29,19 +38,26 @@ Source: https://files.pythonhosted.org/packages/source/w/waitress/waitre
# https://docs.python.org/3/objects.inv -> python3.inv
Source1: python3.inv
Source2: fetch-intersphinx-inventories.sh
-BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
+%if "%{flavor}" == ""
+BuildRequires: %{python_module pytest-cov}
+BuildRequires: %{python_module pytest}
+BuildRequires: %{python_module setuptools}
Requires(post): update-alternatives
Requires(postun): update-alternatives
-BuildArch: noarch
-# SECTION documentation requirements
+%else
+# Documentation requirements
BuildRequires: python3-Sphinx
BuildRequires: python3-docutils
BuildRequires: python3-pylons-sphinx-themes
-# /SECTION
+BuildRequires: python3-waitress = %{version}
+Recommends: python3-waitress = %{version}
+%endif
+BuildArch: noarch
%python_subpackages
+%if "%{flavor}" == ""
%description
Waitress is a pure-Python WSGI server. It has no dependencies except
ones which live in the Python standard library. It supports HTTP/1.0
@@ -50,22 +66,11 @@ and HTTP/1.1.
For more information, see the "docs" directory of the Waitress package or
http://docs.pylonsproject.org/projects/waitress/en/latest/ .
-%package doc
-Summary: Documentation for %{name}
-Group: Documentation/HTML
-Requires: %{name} = %{version}
-
-%description doc
-This package contains documentation files for %{name}.
-
%prep
%setup -q -n waitress-%{version}
-cp %{SOURCE1} docs/
%build
%python_build
-export SPHINXOPTS=-vvv
-python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo
%install
%python_install
@@ -73,12 +78,8 @@ python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
-# Tests require a network connection
-rm waitress/tests/test_adjustments.py
-# make sure utf8 locale is set or tests could fail with:
-# ValueError: underlying buffer has been detached
-export LANG=en_US.UTF8
-%python_exec setup.py test
+# disable one test, that requires network
+%pytest -k 'not test_service_port'
%post
%python_install_alternative waitress-serve
@@ -92,8 +93,22 @@ export LANG=en_US.UTF8
%python_alternative %{_bindir}/waitress-serve
%{python_sitelib}/*
-%files %{python_files doc}
+%else
+# doc flavor
+%description
+This package contains documentation files for %{name}.
+
+%prep
+%setup -q -n waitress-%{version}
+# python3.inv
+cp %{SOURCE1} docs/
+
+%build
+python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo
+
+%files %{python_files}
%license LICENSE.txt
%doc build/sphinx/html
+%endif
%changelog
diff --git a/python3.inv b/python3.inv
index 99ffcde..3703ec7 100644
--- a/python3.inv
+++ b/python3.inv
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0c8b6fe404be5534e725ad69abf2a0f7deb6a2972b6500584df61102ce20d7fd
-size 102981
+oid sha256:bfdd2d959d2afb132ac6d420e36f322838b379cc41a8abf36e28b942e165e442
+size 107005
diff --git a/waitress-1.4.3.tar.gz b/waitress-1.4.3.tar.gz
deleted file mode 100644
index af06ae9..0000000
--- a/waitress-1.4.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:045b3efc3d97c93362173ab1dfc159b52cfa22b46c3334ffc805dbdbf0e4309e
-size 173767
diff --git a/waitress-1.4.4.tar.gz b/waitress-1.4.4.tar.gz
new file mode 100644
index 0000000..d7ee921
--- /dev/null
+++ b/waitress-1.4.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1bb436508a7487ac6cb097ae7a7fe5413aefca610550baf58f0940e51ecfb261
+size 173124