From 2bbfe6f8253659ebf6951b6426ffc446baacd420 Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Tue, 26 May 2015 17:07:37 -0400
Subject: [PATCH] Move windows requirements to requirements.txt

Commit 276028cca26af573c14938255e40c58358eabd4a added these
requirements to setup.py from a custom build hook.  These requirements
can now be expressed in requirements.txt.  We need to move them there
so that the global requirements sync job can continue to keep setup.py
in sync with the global version.

Depends-on: I2369971d306c10dc39a1b89698cec95cf7551d07
Change-Id: I3c07c279d33f6aed46c3a97dd9ba81251e51429a
---
 requirements.txt | 4 ++++
 setup.py         | 8 +-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 9d4e1c260bd..ffac4b9eeec 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -36,3 +36,7 @@ oslo.serialization>=1.4.0 # Apache-2.0
 oslo.utils>=1.6.0 # Apache-2.0
 
 python-novaclient>=2.22.0
+
+# Windows-only requirements
+pywin32;sys_platform=='win32'
+wmi;sys_platform=='win32'
diff --git a/setup.py b/setup.py
index 09b206ed561..056c16c2b8f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,9 +26,4 @@ except ImportError:
 
 setuptools.setup(
     setup_requires=['pbr'],
-    pbr=True,
-    # TODO(lifeless): Once pbr supports markers in requirements.txt, move this
-    # there, so that update.py can see it.
-    extras_require={
-        ':sys_platform=="win32"': ['pywin32', 'wmi']
-    })
+    pbr=True)