merge 3.28.3 into 3.29

--HG-- branch : 3.29

merge 3.28.3 into 3.29
--HG-- branch : 3.29
dc3d9b65 · Nicolas Chauvat · 808bb768b05f · de5e0e183adb · 1a6c58a9 · 1a6c58a9
Commit dc3d9b65 authored Jun 15, 2021 by Nicolas Chauvat
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

.hgtags .hgtags +1 -0

debian/changelog debian/changelog +6 -0

setup.py setup.py +1 -1

No files found.
--- a/.hgtags
+++ b/.hgtags
@@ -655,6 +655,7 @@ e731c31eaed06ac0a781db4d9a36d8b3732a4852 debian/3.27.2-1
 2c0ecdfda9c46f95ef514efa0c9c06c96c98b4bd 3.28.0
 4b2725c4066a0015afa66267dea3bd392235194d 3.28.1
 152838b95709e95297996583a7f1a20262453970 3.28.2
+0b6a5ea3950bcb3bc50b38e7d7288e3b59a7cb1a 3.28.3
 08e8654133c1f0c44d96da36e054347c22d30c9d 3.29.0
 54ddcc997e1cfb7f8701e226fb88128737898c0b 3.29.1
 7ddad2aa6426aa73c09cc8232ecbe0f11bfd5d9c 3.29.2
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,12 @@ cubicweb (3.29.0-1) unstable; urgency=medium

 -- Laurent Peuch <cortex@worlddomination.be>  Tue, 08 Dec 2020 14:51:17 +0200

+cubicweb (3.28.3-1) unstable; urgency=medium
+
+  * New patch release
+
+ -- Laurent Peuch <cortex@worlddomination.be>  Fri, 05 Mar 2021 11:35:47 +0100
+
 cubicweb (3.28.2-1) unstable; urgency=medium

  * New bugfix release

--- a/setup.py
+++ b/setup.py
@@ -99,7 +99,7 @@ setup(
            'vobject >= 0.6.0',
        ],
        'pyramid': [
-            'pyramid >= 1.5.0,<2',
+            'pyramid >= 1.5.0,<2.0.0',
            'waitress >= 0.8.9',
            'wsgicors >= 0.3',
            'pyramid_multiauth',