From 75d500b2b91d08fd47649d334824146afe1b22c0 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <kdreyer@redhat.com>
Date: Nov 06 2019 19:08:08 +0000
Subject: python-cherrypy-18.4.0-1


Changelog:
- Update to 18.4.0 (rhbz#1748716)
- Update comments about current test failures

Resolves: rhbz#1748716

---

diff --git a/.gitignore b/.gitignore
index 03144b7..4b83512 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/CherryPy-18.1.2.tar.gz
+/CherryPy-18.4.0.tar.gz
diff --git a/python-cherrypy.spec b/python-cherrypy.spec
index b95ca03..fdb13f2 100644
--- a/python-cherrypy.spec
+++ b/python-cherrypy.spec
@@ -4,8 +4,8 @@
 
 Name:           python-cherrypy
 %global         camelname CherryPy
-Version:        18.1.2
-Release:        5%{?dist}
+Version:        18.4.0
+Release:        1%{?dist}
 Summary:        Pythonic, object-oriented web development framework
 License:        BSD
 URL:            http://www.cherrypy.org/
@@ -26,7 +26,7 @@ BuildRequires:  python3-setuptools_scm
 # Test dependencies
 BuildRequires:  python3dist(cheroot)
 BuildRequires:  python3dist(mock)
-BuildRequires:  python3-path
+BuildRequires:  python3dist(path.py)
 BuildRequires:  python3dist(portend)
 BuildRequires:  python3dist(pytest)
 BuildRequires:  python3dist(pytest-cov)
@@ -54,10 +54,7 @@ Summary: %summary
 
 dos2unix cherrypy/tutorial/tutorial.conf
 
-# python-path in Fedora is not new enough to support
-# a couple tests:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1206250
-# https://src.fedoraproject.org/rpms/python-path/pull-request/2
+# These tests still fail (reason unknown):
 rm cherrypy/test/test_session.py
 rm cherrypy/test/test_static.py
 
@@ -81,6 +78,10 @@ LANG=C.utf-8 %{__python3} -m pytest --ignore=build
 %exclude %{python3_sitelib}/cherrypy/tutorial
 
 %changelog
+* Wed Nov 06 2019 Ken Dreyer <kdreyer@redhat.com> - 18.4.0-1
+- Update to 18.4.0 (rhbz#1748716)
+- Update comments about current test failures
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 18.1.2-5
 - Rebuilt for Python 3.8.0rc1 (#1748018)
 
diff --git a/sources b/sources
index 1a5c857..73bd59b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (CherryPy-18.1.2.tar.gz) = 5ecfcb7008769dc9122cbfdff1a75d21ee3b572f6bc538a6be4ace7d99a9cef6e823a2c7c75795ad615c46ac01ea72d11f0edebc6f502080b4cb2874938e387f
+SHA512 (CherryPy-18.4.0.tar.gz) = 81288f09c8cfcf25fbce2239271ebe179424db62c23031079d383290fdb7039de913cb754e63ca0ac811c1677457a424dc58b2ccfac31a61256c402dba9db003