Merge branch 'v2' of github.com:Tygs/0bin into v2

README.rst

@@ -1,7 +1,7 @@
-0bin
-====
+0bin: a client side encrypted pastebin
+===========================================
 
-0bin is a client side encrypted pastebin that can run without a database.
+0bin is a pastebin that encrypts the user content in the browsder and can run without a database.
 
 * Try it: `0bin.net <http://0bin.net>`_
 * `Report a bug <https://github.com/sametmax/0bin/issues>`_

setup.cfg

@@ -0,0 +1,28 @@
+[metadata]
+name = zerobin
+version = attr: zerobin.__version__
+description = A client side encrypted pastebin
+long_description = file: README.rst
+author= Sam et Max
+keywords = pastebin, encryption,
+author_email = lesametlemax@gmail.com
+url = https://0bin.net
+
+[options]
+zip_safe = False
+include_package_data = True
+packages = find:
+install_requires =
+    clize==4.1.1
+    lockfile==0.12.2
+    sigtools==2.0.2
+    bottle==0.12.18
+    Beaker==1.11.0
+    Paste==3.4.3
+    appdirs==1.4.4
+    bleach==3.1.5
+
+[options.package_data]
+* = static/img/*, static/css/*, static/js/*, view/*
+hello = *.msg
+

setup.py

@@ -1,43 +1,8 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# vim: ai ts=4 sts=4 et sw=4 nu
-
-import os
-import zerobin
-
-from setuptools import setup, find_packages
-
-src_directory = "zerobin"
-
-open("MANIFEST.in", "w").write(
-    "\n".join(
-        (
-            "include *.rst *.tx",
-            "recursive-include %s *.png *.jpg *.gif *.ico" % src_directory,
-            "recursive-include %s *.tpl" % src_directory,
-        )
-    )
-)
 
 
-setup(
-    name="zerobin",
-    version=zerobin.__version__,
-    packages=find_packages(exclude=["libs", "libs.*"]),
-    author="Sam et Max",
-    author_email="lesametlemax@gmail.com",
-    description="An client side encrypted pastebin",
-    long_description=open("README.rst").read(),
-    install_requires=["cherrypy", "bottle", "clize", "lockfile",],
-    include_package_data=True,
-    classifiers=[
-        "Programming Language :: Python",
-        "Intended Audience :: Information Technology",
-        "License :: OSI Approved :: zlib/libpng License",
-        "Natural Language :: English",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.4",
-    ],
-    entry_points={"console_scripts": ["zerobin = zerobin.cmd:main",]},
-)
+from setuptools import setup
+
+
+setup()