Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove tasty pie. #3318

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions refinery/config/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,6 @@ def get_setting(name, settings=local_settings, default=None):
'haystack',
# NG: added for celery (task queue)
'djcelery', # django-celery
# NG: added for API
"tastypie",
'djangular',
'galaxy_connector',
'analysis_manager',
Expand Down
10 changes: 0 additions & 10 deletions refinery/config/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@
from django.contrib import admin

from registration.backends.default.views import ActivationView
from tastypie.api import Api

from config.utils import RouterCombiner
from core.api import InvitationResource
from core.forms import RegistrationFormWithCustomFields
from core.models import AuthenticationFormUsernameOrEmail
from core.urls import core_router
Expand All @@ -23,11 +21,6 @@

logger = logging.getLogger(__name__)

# NG: added for tastypie URL
v1_api = Api(api_name='v1')

v1_api.register(InvitationResource())


# patterns for all of the different applications
urlpatterns = patterns(
Expand Down Expand Up @@ -87,9 +80,6 @@

url(r'^accounts/', include('registration.backends.default.urls')),

# NG: tastypie API urls
url(r'^api/', include(v1_api.urls)),

user_files_url,
user_files_csv_url

Expand Down
151 changes: 0 additions & 151 deletions refinery/core/api.py

This file was deleted.

22 changes: 0 additions & 22 deletions refinery/core/test_api.py

This file was deleted.

1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ djangorestframework==3.3.3
djangorestframework-recursive==0.1.1
django-rest-swagger==0.3.4
django-storages==1.6.0
django-tastypie==0.12.2
djangular==0.3.0b1
factory_boy==2.8.1
flake8==2.5.4
Expand Down