Skip to content

Commit a5ef6fa

Browse files
committed
add manifest.in, py 3.5 support and relax licensing by moving to MIT
1 parent 6614688 commit a5ef6fa

File tree

7 files changed

+32
-32
lines changed

7 files changed

+32
-32
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ python:
66
- "2.7"
77
- "3.3"
88
- "3.4"
9+
- "3.5"
910
- pypy
1011

1112
install:

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 1.2.1
2+
- Including certain files (e.g. license.md) in sdists via MANIFEST.in (@proinsias)
3+
- Relax licensing by moving from BSD to MIT
4+
- Add Python 3.5 support
5+
16
## 1.2.0
27

38
Backward incompatible change: (@fabiocaccamo)

LICENSE

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

LICENSE.md

-28
This file was deleted.

MANIFEST.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
include LICENSE.md
1+
include LICENSE
22
include README.md
33
include requirements.txt

setup.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
url = 'https://github.com/un33k/python-slugify'
1515
author = 'Val Neekman'
1616
author_email = 'info@neekware.com'
17-
license = 'BSD'
17+
license = 'MIT'
1818
install_requires = ['Unidecode>=0.04.16']
1919
classifiers = [
2020
'Development Status :: 5 - Production/Stable',
2121
'Intended Audience :: Developers',
22-
'License :: OSI Approved :: BSD License',
22+
'License :: OSI Approved :: MIT License',
2323
'Operating System :: POSIX',
2424
'Programming Language :: Python',
2525
'Programming Language :: Python :: 2.6',
@@ -28,6 +28,7 @@
2828
'Programming Language :: Python :: 3.2',
2929
'Programming Language :: Python :: 3.3',
3030
'Programming Language :: Python :: 3.4',
31+
'Programming Language :: Python :: 3.5',
3132
]
3233

3334

slugify/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
__author__ = 'Val Neekman @ Neekware Inc. [@vneekman]'
55
__description__ = 'A Python slugify application that also handles Unicode'
6-
__version__ = '1.2.0'
6+
__version__ = '1.2.1'

0 commit comments

Comments
 (0)