Miscellaneous fixes

imurchie · imurchie · commit ae0dd8e7983c · 2014-04-17T15:56:52.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 
 *.pyc
 *.egg-info
+README.txt
 
 MANIFEST
 
diff --git a/README.md b/README.md
@@ -16,7 +16,16 @@ There are two ways to install and use the Appium Python client.
     pip install Appium-Python-Client
     ```
 
-2. Install from [GitHub](https://github.com/appium/python-client).
+2. Install from source, via [PyPi](https://pypi.python.org/pypi). From ['Appium-Python-Client'](https://pypi.python.org/pypi/Appium-Python-Client),
+download and unarchive the source tarball (Appium-Python-Client-X.X.tar.gz).
+
+    ```shell
+    tar -xvf Appium-Python-Client-X.X.tar.gz
+    cd Appium-Python-Client-X.X
+    python setup.py install
+    ```
+
+3. Install from source via [GitHub](https://github.com/appium/python-client).
 
     ```shell
     git clone git@github.com:appium/python-client.git
diff --git a/docgen.py b/docgen.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+
+# PyPi expects a reStructuredText (http://docutils.sourceforge.net/rst.html)
+# document for its readme. This takes the Github one and makes the requisite
+# file. Run when README.md is changed and those changes should be reflected
+# on PyPi.
+
+import pandoc
+import os
+
+pandoc.core.PANDOC_PATH = os.environ['PANDOC_HOME']
+
+doc = pandoc.Document()
+doc.markdown = open('README.md').read()
+f = open('README.txt','w+')
+f.write(doc.rst)
+f.close()
diff --git a/readme_gen.py b/readme_gen.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+
+# PyPi expects a reStructuredText (http://docutils.sourceforge.net/rst.html)
+# document for its readme. This takes the Github one and makes the requisite
+# file. Run when README.md is changed and those changes should be reflected
+# on PyPi.
+
+import pandoc
+import os
+
+pandoc.core.PANDOC_PATH = os.environ['PANDOC_HOME']
+
+doc = pandoc.Document()
+doc.markdown = open('README.md').read()
+f = open('README.txt','w+')
+f.write(doc.rst)
+f.close()
diff --git a/setup.py b/setup.py
@@ -49,5 +49,6 @@
         'Operating System :: OS Independent',
         'Topic :: Software Development :: Quality Assurance',
         'Topic :: Software Development :: Testing'
-    ]
+    ],
+    install_requires=['selenium>=2.41.0']
 )

Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,6 @@`
`49`	`49`	`'Operating System :: OS Independent',`
`50`	`50`	`'Topic :: Software Development :: Quality Assurance',`
`51`	`51`	`'Topic :: Software Development :: Testing'`
`52`		`- ]`
	`52`	`+ ],`
	`53`	`+ install_requires=['selenium>=2.41.0']`
`53`	`54`	`)`