From 680932e47f27c0a3b28e662fd95b1eb707733607 Mon Sep 17 00:00:00 2001 From: greg-sk Date: Wed, 26 Mar 2014 23:29:49 +0000 Subject: [PATCH] python 2.7 requirement --- CHANGES.rst | 2 ++ MANIFEST.in | 3 ++- rfw/_version.py | 2 +- rfw/rfw.py | 10 ++++++++++ setup.py | 11 ++++++++++- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 91eab5a..1cbaf76 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,5 +2,7 @@ CHANGES --------------------------------- v0.0.1, 2014-03-05 -- Initial release. + v0.1.2, 2014-03-25 -- Deployment ready. + v0.1.19, 2014-03-26 -- Multiple fixes: non-restful mode, README, PUT/DELETE actions, error handling diff --git a/MANIFEST.in b/MANIFEST.in index 0177f88..e162c5c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,5 @@ -include README.rst +include README* +include CHANGES* include bin/* include config/* include config/deploy/* diff --git a/rfw/_version.py b/rfw/_version.py index d38c350..d3ec452 100644 --- a/rfw/_version.py +++ b/rfw/_version.py @@ -1 +1 @@ -__version__ = "0.1.19" +__version__ = "0.2.0" diff --git a/rfw/rfw.py b/rfw/rfw.py index 7cd0a55..dae0416 100644 --- a/rfw/rfw.py +++ b/rfw/rfw.py @@ -28,7 +28,17 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # + from __future__ import print_function +import sys +pytver = sys.version_info +if pytver[0] == 2 and pytver[1] >= 7: + pass +else: + print("rfw requires python 2.7") + sys.exit(1) + + import argparse, logging, re, sys, struct, socket, subprocess, signal, time, json, os from Queue import Queue, PriorityQueue from threading import Thread diff --git a/setup.py b/setup.py index 3fdc46c..1b7f048 100755 --- a/setup.py +++ b/setup.py @@ -28,10 +28,19 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -import os, io, re +import sys, os, io, re from setuptools.command.install import install from setuptools import setup +pytver = sys.version_info + +if pytver[0] == 2 and pytver[1] >= 7: + pass +else: + print("rfw requires python 2.7") + sys.exit(1) + + # post install hook class post_install(install): def run(self):