Skip to content

Commit 7e0e11e

Browse files
committed
Merge branch 'master' of github.com:ngenworks/rest_framework_ember
2 parents 586f32a + 3d9a966 commit 7e0e11e

File tree

4 files changed

+46
-0
lines changed

4 files changed

+46
-0
lines changed

.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
build/*
2+
dist/*
3+
*.egg
4+
*.pyc
5+

AUTHORS

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Jerel Unruh <[email protected]>
2+
Greg Aker <[email protected]>
3+

LICENSE

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
Copyright (c) 2014 nGen Works Company and individual contributors.
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are met:
6+
7+
* Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
9+
10+
* Redistributions in binary form must reproduce the above copyright notice,
11+
this list of conditions and the following disclaimer in the documentation
12+
and/or other materials provided with the distribution.
13+
14+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
15+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
18+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
20+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
21+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
22+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24+
25+

setup.py

+13
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,18 @@ def get_readme():
1717
keywords="EmberJS Django REST",
1818
packages=find_packages(),
1919
install_requires=['django', 'djangorestframework' ],
20+
platforms=['any'],
21+
classifiers=[
22+
'Development Status :: 4 - Beta',
23+
'Framework :: Django',
24+
'Environment :: Web Environment',
25+
'License :: OSI Approved :: BSD License',
26+
'Intended Audience :: Developers',
27+
'Programming Language :: Python',
28+
'Programming Language :: Python :: 2.6',
29+
'Programming Language :: Python :: 2.7',
30+
'Topic :: Software Development :: Libraries :: Application Frameworks',
31+
'Topic :: Software Development :: Libraries :: Python Modules',
32+
]
2033
)
2134

0 commit comments

Comments
 (0)