Skip to content

Commit 9039ef3

Browse files
committed
more suitable license
1 parent cf43547 commit 9039ef3

File tree

3 files changed

+51
-16
lines changed

3 files changed

+51
-16
lines changed

LICENSE

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Copyright (c) 2011 Caio Ariede and Codasus Technologies.
2+
3+
Permission is hereby granted, free of charge, to any person
4+
obtaining a copy of this software and associated documentation
5+
files (the "Software"), to deal in the Software without
6+
restriction, including without limitation the rights to use,
7+
copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the
9+
Software is furnished to do so, subject to the following
10+
conditions:
11+
12+
The above copyright notice and this permission notice shall be
13+
included in all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
17+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
19+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
20+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
21+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22+
OTHER DEALINGS IN THE SOFTWARE.

README.md

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,27 @@ Open your project's `settings.py` file and:
3232

3333
`PRAGMA_KEY = "YOUR DATABASE KEY"`
3434

35-
**License**
36-
37-
django-sqlcipher by [Codasus Technologies](http://codasus.com) is licensed under a [Creative Commons Attribution-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-sa/3.0/).
38-
39-
You are free:
40-
41-
* to Share - to copy, distribute and transmit the work
42-
* to Remix - to adapt the work
43-
* to make commercial use of the work
35+
**MIT License**
36+
37+
<pre>Copyright (c) 2011 Caio Ariede and Codasus Technologies.
38+
39+
Permission is hereby granted, free of charge, to any person
40+
obtaining a copy of this software and associated documentation
41+
files (the "Software"), to deal in the Software without
42+
restriction, including without limitation the rights to use,
43+
copy, modify, merge, publish, distribute, sublicense, and/or sell
44+
copies of the Software, and to permit persons to whom the
45+
Software is furnished to do so, subject to the following
46+
conditions:
47+
48+
The above copyright notice and this permission notice shall be
49+
included in all copies or substantial portions of the Software.
50+
51+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
52+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
53+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
54+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
55+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
56+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
57+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
58+
OTHER DEALINGS IN THE SOFTWARE.</pre>

setup.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
root = os.path.dirname(os.path.abspath(__file__))
66
os.chdir(root)
77

8-
master_file = open(os.path.join(root, ".git", "refs", "heads", "master"))
9-
VERSION = '0.1.git-' + master_file.read().strip()
10-
master_file.close()
8+
VERSION = '0.1'
119

1210
# Make data go to the right place.
1311
# http://groups.google.com/group/comp.lang.python/browse_thread/thread/35ec7b2fed36eaec/2105ee4d9e8042cb
@@ -28,12 +26,12 @@
2826
packages=['sqlcipher'],
2927
classifiers=[
3028
"Development Status :: 3 - Alpha",
31-
"Environment :: Web Environment",
29+
"Framework :: Django",
3230
"Intended Audience :: Developers",
33-
"License :: OSI Approved :: MIT License",
31+
"Natural Language :: English",
3432
"Operating System :: OS Independent",
35-
"Programming Language :: Python",
36-
"Framework :: Django",
33+
"Topic :: Database",
34+
"Topic :: Security :: Cryptography",
3735
],
3836
include_package_data=True,
3937
)

0 commit comments

Comments
 (0)