From becf66efc998936693fa73d2ba954234a31c40cf Mon Sep 17 00:00:00 2001 From: Corey Goldberg Date: Tue, 8 Oct 2013 13:42:48 -0400 Subject: [PATCH] flattened package to module and updated setup and tests --- MANIFEST.in | 3 +-- README.rst | 4 ++-- setup.py | 6 ++---- xvfbwrapper/test_xvfb.py => test_xvfb.py | 12 ++++++------ tox.ini | 2 +- xvfbwrapper/xvfbwrapper.py => xvfbwrapper.py | 0 xvfbwrapper/__init__.py | 2 -- 7 files changed, 12 insertions(+), 17 deletions(-) rename xvfbwrapper/test_xvfb.py => test_xvfb.py (87%) rename xvfbwrapper/xvfbwrapper.py => xvfbwrapper.py (100%) delete mode 100644 xvfbwrapper/__init__.py diff --git a/MANIFEST.in b/MANIFEST.in index 339542e..d01e168 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,3 @@ prune * include README.rst -include setup.py -recursive-include xvfbwrapper *.py \ No newline at end of file +include *.py \ No newline at end of file diff --git a/README.rst b/README.rst index 5e9a138..575b98f 100644 --- a/README.rst +++ b/README.rst @@ -24,13 +24,13 @@ Install xvfbwrapper from PyPI:: *********************** * Xvfb (`sudo apt-get install xvfb`, or similar) -* Python 2.7 or 3.2+ (tested on py27, py32, py33, pypy) +* Python 2.7 or 3.2+ (tested on py27, py32, py33) ************************************** About Xvfb (X Virtual Framebuffer) ************************************** -In the X Window System, Xvfb or X virtual framebuffer is an X11 server that performs all graphical operations in memory, not showing any screen output. This virtual server does not require the computer it is running on to even have a screen or any input device. Only a network layer is necessary. +In the X Window System, Xvfb or X Virtual FrameBuffer is an X11 server that performs all graphical operations in memory, not showing any screen output. This virtual server does not require the computer it is running on to even have a screen or any input device. Only a network layer is necessary. ************************ Example: Basic Usage diff --git a/setup.py b/setup.py index b2e3180..85e825f 100644 --- a/setup.py +++ b/setup.py @@ -7,8 +7,6 @@ import os from distutils.core import setup -import xvfbwrapper - this_dir = os.path.abspath(os.path.dirname(__file__)) with open(os.path.join(this_dir, 'README.rst')) as f: @@ -17,8 +15,8 @@ with open(os.path.join(this_dir, 'README.rst')) as f: setup( name='xvfbwrapper', - version=xvfbwrapper.__version__, - packages=['xvfbwrapper'], + version='0.2.4', + py_modules=['xvfbwrapper'], author='Corey Goldberg', author_email='cgoldberg _at_ gmail.com', description='run headless display inside X virtual framebuffer (Xvfb)', diff --git a/xvfbwrapper/test_xvfb.py b/test_xvfb.py similarity index 87% rename from xvfbwrapper/test_xvfb.py rename to test_xvfb.py index 2dc5618..c50d133 100644 --- a/xvfbwrapper/test_xvfb.py +++ b/test_xvfb.py @@ -1,7 +1,7 @@ #!/usr/bin/env python -from .xvfbwrapper import Xvfb +from xvfbwrapper import Xvfb import os import sys @@ -22,7 +22,7 @@ class TestXvfb(unittest.TestCase): self.addCleanup(xvfb.stop) xvfb.start() self.assertEqual(':%d' % xvfb.vdisplay_num, os.environ['DISPLAY']) - self.assertIsNot(None, xvfb.proc) + self.assertIsNotNone(xvfb.proc) def test_stop(self): orig_display = os.environ['DISPLAY'] @@ -30,15 +30,15 @@ class TestXvfb(unittest.TestCase): xvfb.start() self.assertNotEqual(orig_display, os.environ['DISPLAY']) xvfb.stop() - self.assertIs(None, xvfb.proc) + self.assertIsNone(xvfb.proc) self.assertEqual(orig_display, os.environ['DISPLAY']) def test_as_context_manager(self): orig_display = os.environ['DISPLAY'] with Xvfb() as xvfb: self.assertEqual(':%d' % xvfb.vdisplay_num, os.environ['DISPLAY']) - self.assertIsNot(None, xvfb.proc) - self.assertIs(None, xvfb.proc) + self.assertIsNotNone(xvfb.proc) + self.assertIsNone(xvfb.proc) self.assertEqual(orig_display, os.environ['DISPLAY']) def test_start_with_kwargs(self): @@ -59,4 +59,4 @@ class TestXvfb(unittest.TestCase): self.addCleanup(xvfb.stop) xvfb.start() self.assertEqual(os.environ['DISPLAY'], ':%d' % xvfb.vdisplay_num) - self.assertIsNot(None, xvfb.proc) + self.assertIsNotNone(xvfb.proc) diff --git a/tox.ini b/tox.ini index c4afc98..4980df7 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = flake8, py27, py32, py33, pypy +envlist = flake8, py27, py32, py33 [flake8] exclude = .tox, build diff --git a/xvfbwrapper/xvfbwrapper.py b/xvfbwrapper.py similarity index 100% rename from xvfbwrapper/xvfbwrapper.py rename to xvfbwrapper.py diff --git a/xvfbwrapper/__init__.py b/xvfbwrapper/__init__.py deleted file mode 100644 index 12dad7e..0000000 --- a/xvfbwrapper/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ - -__version__ = '0.2.3'