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

Update versions in requirements.txt and remove deprecated feature #61

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
language: python
python:
- "2.6"
- "2.7"
- "nightly"
matrix:
Expand Down
27 changes: 14 additions & 13 deletions apel_rest/urls.py
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
"""This file maps url patterns to classes."""

from django.conf.urls import patterns, include, url
from django.conf.urls import include, url

from django.contrib import admin
from api.views.CloudRecordSummaryView import CloudRecordSummaryView
from api.views.CloudRecordView import CloudRecordView

admin.autodiscover()

urlpatterns = patterns('',
# Examples:
# url(r'^$', 'apel_rest.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),
urlpatterns = [
# Examples:
# url(r'^$', 'apel_rest.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),

url(r'^admin/',
include(admin.site.urls)),
url(r'^admin/', include(admin.site.urls)),

url(r'^api/v1/cloud/record$',
CloudRecordView.as_view(),
name='CloudRecordView'),
url(r'^api/v1/cloud/record$',
CloudRecordView.as_view(),
name='CloudRecordView'),

url(r'^api/v1/cloud/record/summary$',
CloudRecordSummaryView.as_view(),
name='CloudRecordSummaryView'))
url(r'^api/v1/cloud/record/summary$',
CloudRecordSummaryView.as_view(),
name='CloudRecordSummaryView')
]
5 changes: 4 additions & 1 deletion api/views/CloudRecordSummaryView.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
"""This file contains the CloudRecordSummaryView class."""

import ConfigParser
try:
import ConfigParser
except ImportError:
import configparser as ConfigParser
import datetime
import logging
import MySQLdb
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dirq
django==1.6.3
djangorestframework==3.0.5
django==1.11.20
djangorestframework==3.9.4
python-jose<3.0.0
MySQL-python
mysqlclient==1.3.4