From 38ac4bff79f5d026eef8f67a5f6fccf77e9ccba1 Mon Sep 17 00:00:00 2001
From: Mark Burnett <mark.m.burnett@gmail.com>
Date: Wed, 25 Apr 2018 11:56:51 -0500
Subject: [PATCH] Speed up image build

* Ignore FIO output file when building docker
* Removes PBR and removes .git from docker context

Change-Id: I58d4fa7e9d538035c52b1826d1488f72e74beea8
---
 .dockerignore |  2 ++
 setup.cfg     | 39 ---------------------------------------
 setup.py      | 13 +++++++++++--
 tox.ini       |  2 +-
 4 files changed, 14 insertions(+), 42 deletions(-)
 delete mode 100644 setup.cfg

diff --git a/.dockerignore b/.dockerignore
index 10182d87..db6b0ca8 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -8,6 +8,8 @@ charts/*/requirements.lock
 
 # Build & test artifacts
 .eggs
+.fiotest
+.git
 .helm-pid
 .tox
 AUTHORS
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 942f0220..00000000
--- a/setup.cfg
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2017 The Promenade Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-[metadata]
-name = promenade
-
-[pbr]
-use-egg = false
-
-[files]
-packages =
-    promenade
-package-data =
-    templates = templates/*
-    schemas = schemas/*
-
-[entry_points]
-console_scripts =
-    promenade = promenade.cli:promenade
-
-[build_sphinx]
-source-dir = docs/source
-build-dir = docs/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = docs/build/html
diff --git a/setup.py b/setup.py
index c137afb5..bcdbd40d 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,15 @@
 from setuptools import setup
 
 setup(
-    setup_requires=['pbr>=1.9', 'setuptools>=17.1'],
-    pbr=True,
+    setup_requires=['setuptools>=17.1'],
+    name='promenade',
+    version='0.8.0',
+    packages=['promenade'],
+    package_data={
+        'schemas': 'schemas/*',
+        'templates': 'templates/*',
+    },
+    entry_points={
+        'console_scripts': 'promenade=promenade.cli:promenade',
+    },
 )
diff --git a/tox.ini b/tox.ini
index dd2da86e..73a85840 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ deps =
     -r{toxinidir}/test-requirements.txt
 commands =
     rm -rf docs/build
-    python setup.py build_sphinx {posargs}
+    sphinx-build -b html docs/source docs/build
 
 [testenv:fmt]
 deps = yapf==0.20.0