From 9f972076a2af3ac4f0f980a20c3f6c93be23f32b Mon Sep 17 00:00:00 2001
From: Barnaby Court <bcourt@redhat.com>
Date: Wed, 22 Apr 2015 14:41:30 -0400
Subject: [PATCH] Bump the version requirement & the base version of
 pulp-python

---
 .travis.yml                  |  2 +-
 common/setup.py              |  2 +-
 docs/conf.py                 |  4 ++--
 docs/release-notes/1.1.rst   | 38 ++++++++++++++++++++++++++++++++++++
 docs/release-notes/index.rst |  1 +
 extensions_admin/setup.py    |  2 +-
 plugins/setup.py             |  2 +-
 pulp-python.spec             |  6 +++---
 8 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 docs/release-notes/1.1.rst

diff --git a/.travis.yml b/.travis.yml
index e7eb3556..a7026bae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ python:
   - "pypy"
 before_install:
   - "pushd .."
-  - "git clone https://github.com/pulp/pulp.git --branch master"
+  - "git clone https://github.com/pulp/pulp.git --branch 2.7-dev"
   - "git clone https://github.com/pulp/nectar.git"
   - "pushd nectar"
   - "git checkout python-nectar-1.1.6-1"
diff --git a/common/setup.py b/common/setup.py
index d41d5da2..853380d3 100755
--- a/common/setup.py
+++ b/common/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='pulp_python_common',
-    version='1.0.0',
+    version='1.1.0a1',
     packages=find_packages(),
     url='http://www.pulpproject.org',
     license='GPLv2+',
diff --git a/docs/conf.py b/docs/conf.py
index 746897aa..a9e9efa4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.0'
+release = '1.1.0a1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/release-notes/1.1.rst b/docs/release-notes/1.1.rst
new file mode 100644
index 00000000..c9239eda
--- /dev/null
+++ b/docs/release-notes/1.1.rst
@@ -0,0 +1,38 @@
+1.1 Release Notes
+=================
+
+1.1.0
+-----
+
+The Pulp team is pleased to release version 1.1.0 of the Python plugins for Pulp.
+
+Requirements
+^^^^^^^^^^^^
+The 1.1.x releases of the Python plugins depend on the Pulp 2.7.x or greater.
+
+Upgrade
+^^^^^^^
+
+To upgrade, simply follow these steps (substituting for systemctl as appropriate, if you are not
+using systemd):
+
+#. Stop all Pulp services on every machine that is part of the installation::
+
+   $ for s in {pulp_workers,pulp_resource_manager,pulp_celerybeat,httpd,goferd}; do sudo systemctl stop $s; done;
+
+#. Upgrade the Pulp packages on every machine::
+
+   $ sudo yum update
+
+#. Apply database migrations::
+
+   $ sudo -u apache pulp-manage-db
+
+#. Start the Pulp services::
+
+   $ for s in {pulp_workers,pulp_resource_manager,pulp_celerybeat,httpd,goferd}; do sudo systemctl start $s; done;
+
+Bugfixes
+^^^^^^^^
+
+This release contains minor bugfixes. See the :fixedbugs:`1.1.0`.
diff --git a/docs/release-notes/index.rst b/docs/release-notes/index.rst
index 7bcf25a9..0a9289bd 100644
--- a/docs/release-notes/index.rst
+++ b/docs/release-notes/index.rst
@@ -5,3 +5,4 @@ Release Notes
    :maxdepth: 2
 
    1.0
+   1.1
diff --git a/extensions_admin/setup.py b/extensions_admin/setup.py
index 0847eee2..13dbed88 100755
--- a/extensions_admin/setup.py
+++ b/extensions_admin/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='pulp_python_extensions_admin',
-    version='1.0.0',
+    version='1.1.0a1',
     packages=find_packages(),
     url='http://www.pulpproject.org',
     license='GPLv2+',
diff --git a/plugins/setup.py b/plugins/setup.py
index 780492c1..3b4dfd48 100755
--- a/plugins/setup.py
+++ b/plugins/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='pulp_python_plugins',
-    version='1.0.0',
+    version='1.1.0a1',
     packages=find_packages(),
     url='http://www.pulpproject.org',
     license='GPLv2+',
diff --git a/pulp-python.spec b/pulp-python.spec
index 65739693..c0a1721f 100644
--- a/pulp-python.spec
+++ b/pulp-python.spec
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name: pulp-python
-Version: 1.0.0
-Release: 1%{?dist}
+Version: 1.1.0
+Release: 0.1.alpha%{?dist}
 Summary: Support for Python content in the Pulp platform
 Group: Development/Languages
 License: GPLv2
@@ -14,7 +14,7 @@ BuildArch:      noarch
 BuildRequires:  python-setuptools
 
 # This is the minimum platform version we require to function.
-%define pulp_version 2.5
+%define pulp_version 2.7
 
 %description
 Provides a collection of platform plugins and client extensions support for Python packages.