Fix dependencies to Piston

ernany · Nov 1, 2011 · 8ef6906 · 8ef6906
1 parent d1aeab8
commit 8ef6906
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 23 deletions.
diff --git a/docs/source/installation-overview.rst b/docs/source/installation-overview.rst
@@ -42,7 +42,7 @@ To get started with Newfies-Dialer you must have the following installed:
 - wsgiref >= 0.1.2 (Validation support for WSGI )
 - switch2bill-common (Common library that are reused by Star2Billing)
 - simu-prefix-country (Provide Prefix and Country information)
-- django-piston (Django application that create APIs for your sites.)
+- django-tastypie (Creating delicious APIs for Django)
 - BeautifulSoup >= 3.2.0 (HTML parser optimized for screen-scraping)
 - Pygments >= 1.4 (A generic syntax highlighter)
 - django-admin-tools (Collection of tools for the django administration)

diff --git a/install/conf/requirements-rtd.txt b/install/conf/requirements-rtd.txt
@@ -33,5 +33,4 @@ git+git://github.com/aerosol/identicon.git
 git+git://github.com/aerosol/django-dilla.git
 django-sentry==1.8.6.2
 git+git://github.com/mcroydon/django-qsstats.git
--e hg+https://bitbucket.org/jespern/django-piston/#egg=django-piston
-git+git://github.com/Star2Billing/django-admin-tools-stats.git
+git+git://github.com/Star2Billing/django-admin-tools-stats.git
diff --git a/install/conf/requirements.txt b/install/conf/requirements.txt
@@ -40,6 +40,5 @@ git+git://github.com/Star2Billing/switch2bill-common.git
 git+git://github.com/Star2Billing/simu-prefix-country.git
 git+git://github.com/areski/django-countries.git
 -e hg+http://bitbucket.org/andrewgodwin/south/#egg=south
--e hg+https://bitbucket.org/jespern/django-piston/#egg=django-piston
 git+git://github.com/Star2Billing/django-admin-tools-stats.git
 git+git://github.com/toastdriven/django-tastypie.git
diff --git a/install/conf/settings_local.py b/install/conf/settings_local.py
@@ -46,12 +46,8 @@
 #REDIS_CONNECT_RETRY = True
 
 
-#PISTON
-#======
-PISTON_DISPLAY_ERRORS = True
-PISTON_EMAIL_ERRORS = "[email protected]"
-#PISTON_IGNORE_DUPE_MODELS = True
-
+#EMAIL BACKEND
+#=============
 # Use only in Debug mode. Not in production
 #EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 

diff --git a/install/install-newfies.sh b/install/install-newfies.sh
@@ -244,13 +244,6 @@ func_install_frontend(){
     pip install -r /usr/src/newfies-dialer/install/conf/requirements.txt
     pip install plivohelper
 
-    #Nasty hack to make piston compatible with django-admin-tools
-    #https://bitbucket.org/jespern/django-piston/issue/117/register-models-with-admin-in-an-adminpy    
-    sed -i "s/admin.site.register/#admin.site.register/" /usr/share/virtualenvs/newfies-dialer/lib/python2.6/site-packages/piston/models.py
-    sed -i "s/admin.site.register/#admin.site.register/" /usr/share/virtualenvs/newfies-dialer/lib/python2.7/site-packages/piston/models.py
-    #check on CentOS if virtualenv works
-    #sed -i "s/admin.site.register/#admin.site.register/" /usr/lib/python2.6/site-packages/django_piston-0.2.2-py2.6.egg/piston/models.py
-
     # copy settings_local.py into newfies dir
     cp /usr/src/newfies-dialer/install/conf/settings_local.py $INSTALL_DIR
 

diff --git a/newfies/settings.py b/newfies/settings.py
@@ -295,12 +295,9 @@
 ADMIN_TOOLS_APP_INDEX_DASHBOARD =\
 'custom_admin_tools.dashboard.CustomAppIndexDashboard'
 
-#PISTON
-#======
-PISTON_DISPLAY_ERRORS = True
-PISTON_EMAIL_ERRORS = "[email protected]"
-#PISTON_IGNORE_DUPE_MODELS = True
 
+#EMAIL BACKEND
+#=============
 # Use only in Debug mode. Not in production
 #EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'

diff --git a/setup.py b/setup.py
@@ -114,7 +114,6 @@ def parse_dependency_links(file_name, install_flag=False):
     #    "Django >= 1.3.0",
     #    "django-notification >= 0.1.2",
     #    "django-pagination >= 1.0.5",
-    #    "django-piston",
     #    "South >= 0.7.2",
     #],
     setup_requires = [