summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Marshall <catchjosh@gmail.com>2011-02-26 14:49:36 -0600
committerJosh Marshall <catchjosh@gmail.com>2011-02-26 14:49:36 -0600
commitefcf5eee0e12ef8a148caaa9f16db1b0bd009cbb (patch)
tree51f221876ec5b65d768da6fb305d3245953becc3
parent3291ce42501a715ae9cacf85dbe89c42b059fd3a (diff)
downloadjsonrpclib-efcf5eee0e12ef8a148caaa9f16db1b0bd009cbb.tar.gz
Adding updates for PyPI submission.
-rw-r--r--.gitignore1
-rw-r--r--LICENSE.txt11
-rw-r--r--MANIFEST.in1
-rw-r--r--README.md18
-rw-r--r--setup.py5
5 files changed, 33 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index e8bc046..f7d6c1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
*.pyc
build/*
+dist/*
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..51fca54
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,11 @@
+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.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..ab30e9a
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+include *.txt
diff --git a/README.md b/README.md
index 9d431a4..85a157e 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,22 @@ should already have one. Keep in mind that cjson is supposed to be the
quickest, I believe, so if you are going for full-on optimization you may
want to pick it up.
+Installation
+------------
+You can install this from PyPI with one of the following commands (sudo
+may be required):
+
+ easy_install jsonrpclib
+ pip install jsonrpclib
+
+Alternatively, you can download the source from the github repository
+at http://github.com/joshmarshall/jsonrpclib and manually install it
+with the following commands:
+
+ git clone git://github.com/joshmarshall/jsonrpclib.git
+ cd jsonrpclib
+ python setup.py install
+
Client Usage
------------
@@ -200,4 +216,4 @@ You can run it with:
TODO
----
* Use HTTP error codes on SimpleJSONRPCServer
-* Test, test, test and optimize \ No newline at end of file
+* Test, test, test and optimize
diff --git a/setup.py b/setup.py
index c51e62a..49d30ec 100644
--- a/setup.py
+++ b/setup.py
@@ -17,12 +17,13 @@ import distutils.core
distutils.core.setup(
name = "jsonrpclib",
- version = "0.13",
+ version = "0.1.3",
packages = ["jsonrpclib"],
author = "Josh Marshall",
author_email = "catchjosh@gmail.com",
- url = "http://code.google.com/p/jsonrpclib/",
+ url = "http://github.com/joshmarshall/jsonrpclib/",
license = "http://www.apache.org/licenses/LICENSE-2.0",
description = "This project is an implementation of the JSON-RPC v2.0 " +
"specification (backwards-compatible) as a client library.",
+ long_description = open("README.md").read()
)