From ac65bcbed1b57f838ef55beedd25735563b2a5b0 Mon Sep 17 00:00:00 2001
From: Ondrej Nosek <onosek@redhat.com>
Date: Feb 04 2019 08:35:06 +0000
Subject: 1.36 Release


Signed-off-by: Ondrej Nosek <onosek@redhat.com>

---

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 696f298..d7ec4bf 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -24,9 +24,9 @@ copyright = '2018, fedpkg Team'
 author = 'fedpkg Team'
 
 # The short X.Y version
-version = '1.35'
+version = '1.36'
 # The full version, including alpha/beta/rc tags
-release = '1.35'
+release = '1.36'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/doc/source/releases.rst b/doc/source/releases.rst
index d35f431..66c798f 100644
--- a/doc/source/releases.rst
+++ b/doc/source/releases.rst
@@ -6,6 +6,7 @@ Releases
 .. toctree::
    :maxdepth: 1
 
+   releases/1.36
    releases/1.35
    releases/1.34
    releases/1.33
diff --git a/doc/source/releases/1.36.rst b/doc/source/releases/1.36.rst
new file mode 100644
index 0000000..f3f8b9f
--- /dev/null
+++ b/doc/source/releases/1.36.rst
@@ -0,0 +1,54 @@
+.. _release_1.36:
+
+fedpkg 1.36 Release Notes
+=========================
+
+Released on *February 1, 2018*
+
+This release requires ``rpkg >= 1.57``.
+
+Python compatibility
+--------------------
+
+fedpkg works with Python 2.6, 2.7, 3.6 and 3.7.
+
+What's new in fedpkg 1.36
+-------------------------
+
+Add support for a ``flatpaks`` namespace
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+flatpaks will be added as a separate namespace in Fedora distgit:
+see more info at `fedora devel mailing list`_.
+
+The handling will be like modules - where flatpaks are currently:
+- No bugzilla bug is required for repository creation
+- Branch names must be valid module stream names
+
+Make ``fedpkg update`` work for containers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+We don't really have an NVR available, but users can fill it in by themselves.
+Also add ``severity=`` option to ``fedpkg update`` template. This is now
+required argument for all security updates.
+
+Change Logs
+-----------
+
+* Added update-docs script (onosek)
+* Sdist fix and Python 2.6 compatibility (onosek)
+* Add support for a 'flatpaks' namespace (otaylor)
+* Move argparse fix to rpkg - `#299`_ (onosek)
+* Fix update command related tests (cqi)
+* Make update work for containers - `#296`_ (lsedlar)
+* Add 'severity=' option to 'fedpkg update' template (praiskup)
+* Add contributing guide - `#293`_ (lsedlar)
+* Use module distro instead of platform - `#278`_ (cqi)
+* Add missing content to 1.35 release notes (cqi)
+* Help: Use foo in foo examples, not name (miro)
+
+.. _`fedora devel mailing list`: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/LOLYI2FHGCVJ7EKC6NB3CZ3ACBRKQFCK/
+.. _`#299`: https://pagure.io/fedpkg/issue/299
+.. _`#296`: https://pagure.io/fedpkg/issue/296
+.. _`#293`: https://pagure.io/fedpkg/issue/293
+.. _`#278`: https://pagure.io/fedpkg/issue/278
diff --git a/setup.py b/setup.py
index bbb3c06..e15bde4 100755
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ else:
 
 setup(
     name="fedpkg",
-    version="1.35",
+    version="1.36",
     author="Dennis Gilmore",
     author_email="dgilmore@fedoraproject.org",
     description=("Fedora plugin to rpkg to manage "