ktdreyer pushed to ceph-deploy (f20). "update to ceph-deploy 1.5.22 (RHBZ #1201064) (..more)"

[notifications at fedoraproject.org]

>From d66b0658ff5a04983245999be1fa5328669277e3 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer at ktdreyer.com>
Date: Thu, 26 Mar 2015 08:14:17 -0600
Subject: update to ceph-deploy 1.5.22 (RHBZ #1201064)

- add tox.ini to the packaging
- run tox tests, but unconditionally pass them for now

diff --git a/.gitignore b/.gitignore
index c510b30..3887bb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /ceph-deploy-1.5.15.tar.xz
 /ceph-deploy-1.5.20.tar.gz
 /ceph-deploy-1.5.21.tar.gz
+/ceph-deploy-1.5.22.tar.gz
diff --git a/ceph-deploy-1.5.22-tox.ini b/ceph-deploy-1.5.22-tox.ini
new file mode 100644
index 0000000..3da3548
--- /dev/null
+++ b/ceph-deploy-1.5.22-tox.ini
@@ -0,0 +1,32 @@
+[tox]
+envlist = py26, py27, flake8
+
+[testenv]
+deps=
+  pytest
+  mock
+setenv =
+    CEPH_DEPLOY_TEST = 1
+commands=py.test -v {posargs:ceph_deploy/tests}
+
+[testenv:docs]
+basepython=python
+changedir=docs/source
+deps=sphinx
+commands=
+    sphinx-build -W -b html -d {envtmpdir}/doctrees .  {envtmpdir}/html
+
+[testenv:flake8]
+deps=flake8
+commands=flake8 --select=F --exclude=vendor {posargs:ceph_deploy}
+
+# Note that ``remoto`` is not added as a dependency here as it is assumed
+# that the tester will have the distro version of remoto installed
+
+[testenv:py26-novendor]
+sitepackages=True
+deps=
+
+[testenv:py27-novendor]
+sitepackages=True
+deps=
diff --git a/ceph-deploy.spec b/ceph-deploy.spec
index 689ecad..440ae21 100644
--- a/ceph-deploy.spec
+++ b/ceph-deploy.spec
@@ -4,7 +4,7 @@
 %endif
 
 Name:           ceph-deploy
-Version:        1.5.21
+Version:        1.5.22
 Release:        1%{?dist}
 Summary:        Admin and deploy tool for Ceph
 
@@ -12,6 +12,9 @@ License:        MIT
 URL:            https://github.com/ceph/ceph-deploy
 
 Source0:        http://pypi.python.org/packages/source/c/%{name}/%{name}-%{version}.tar.gz
+# http://tracker.ceph.com/issues/11242
+# https://raw.githubusercontent.com/ceph/ceph-deploy/v1.5.22/tox.ini
+Source1:        ceph-deploy-1.5.22-tox.ini
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -43,9 +46,10 @@ CEPH_DEPLOY_NO_VENDOR=1 %{__python2} setup.py install -O1 --skip-build --root $R
 
 
 %check
+install -m0644 %{SOURCE1} tox.ini
 # Tests are currently broken:
 #   http://tracker.ceph.com/issues/8825
-#CEPH_DEPLOY_NO_VENDOR=1 tox -e py27-novendor
+CEPH_DEPLOY_NO_VENDOR=1 tox -e py27-novendor || :
 
 
 %files
@@ -55,6 +59,11 @@ CEPH_DEPLOY_NO_VENDOR=1 %{__python2} setup.py install -O1 --skip-build --root $R
 
 
 %changelog
+* Tue Mar 24 2015 Ken Dreyer <ktdreyer at ktdreyer.com> - 1.5.22-1
+- update to ceph-deploy 1.5.22 (RHBZ #1201064)
+- add tox.ini to the packaging
+- run tox tests, but unconditionally pass them for now
+
 * Wed Dec 10 2014 Ken Dreyer <ktdreyer at ktdreyer.com> - 1.5.21-1
 - update to ceph-deploy-1.5.21
 
diff --git a/sources b/sources
index fb98efd..923b024 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-762402c62951f9bc75cd97213f6c07d5  ceph-deploy-1.5.21.tar.gz
+c6d197fce5d7ee309a29f2c9cf3b227c  ceph-deploy-1.5.22.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ceph-deploy.git/commit/?h=f20&id=d66b0658ff5a04983245999be1fa5328669277e3