Merge pull request crate#64 from crate/dobe/removecrash

Dobe/removecrash
f-ritter · Mar 13, 2014 · bd75992 · bd75992
2 parents ee4711f + 2a0324c
commit bd75992
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 800 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,6 +5,8 @@ Changes for crate
 Unreleased
 ==========
 
+ - removed the crate shell ``crash`` from this package. it will live
+   now under the name ``crate-shell`` on pypi.
 
 2014/03/12 0.6.0
 ================

diff --git a/buildout.cfg b/buildout.cfg
@@ -5,21 +5,13 @@ versions = versions
 show-picked-versions = true
 
 parts = test
-        scripts
         crate
         tox
 
 [tox]
 recipe = zc.recipe.egg:script
 eggs = tox
 
-[scripts]
-recipe = zc.recipe.egg:script
-interpreter = py
-eggs = crate
-       crate [test,sqlalchemy]
-       setuptools
-
 [crate]
 recipe = hexagonit.recipe.download
 url = https://cdn.crate.io/downloads/releases/crate-${versions:crate_server}.tar.gz

diff --git a/devtools/bootstrap.py b/devtools/bootstrap.py
diff --git a/devtools/buildout.cfg b/devtools/buildout.cfg
diff --git a/devtools/bundle.sh b/devtools/bundle.sh
diff --git a/setup.py b/setup.py
@@ -26,21 +26,11 @@
 
 
 requirements = [
+    'setuptools',
     'requests>=2.0.1,<3.0',
-    'PrettyTable>=0.7,<0.8',
-    'appdirs>=1.2,<2.0',
     'six'
 ]
 
-if (2, 6) == sys.version_info[:2]:
-    requirements.append('argparse>=1.2.1')
-
-if sys.platform == 'darwin':
-    requirements.append('readline>=6.2.4.1')
-elif sys.platform == 'win32':
-    requirements.append('pyreadline>=1.7.1')
-
-
 def read(path):
     return open(os.path.join(os.path.dirname(__file__), path)).read()
 
@@ -75,9 +65,6 @@ def read(path):
     packages=find_packages('src'),
     namespace_packages=['crate'],
     entry_points={
-        'console_scripts': [
-            'crash = crate.client.crash:main',
-        ],
         'sqlalchemy.dialects': [
             'crate = crate.client.sqlalchemy:CrateDialect'
         ]