Skip to content

Commit 420c530

Browse files
committed
MIT license, fix setup.py
1 parent 0da311e commit 420c530

2 files changed

Lines changed: 29 additions & 39 deletions

File tree

LICENSE

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1-
ISC License
1+
The MIT License
22

3-
Copyright (c) 2016, Nick Ficano
3+
Copyright (c) 2019 Harvard Medical School
44

5-
Permission to use, copy, modify, and/or distribute this software for any
6-
purpose with or without fee is hereby granted, provided that the above
7-
copyright notice and this permission notice appear in all copies.
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:
811

9-
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10-
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11-
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12-
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13-
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14-
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15-
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
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.

setup.py

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,25 @@
11
# -*- coding: utf-8 -*-
22
import sys
3-
43
from setuptools import setup, find_packages
54

6-
with open('README.rst') as readme_file:
7-
readme = readme_file.read()
8-
9-
install_requirements = [
10-
'boto3>=1.10.7',
11-
'botocore>=1.13.7',
12-
'docutils>=0.14'
13-
]
14-
15-
# Only install futures package if using a Python version <= 2.7
16-
if sys.version_info < (3, 0):
17-
install_requirements.append('futures==3.0.5')
185

196
pkg_version = open("aws_lambda/_version.py").readlines()[-1].split()[-1].strip("\"'")
7+
with open('README.rst') as readme_file:
8+
readme = readme_file.read()
9+
with open('requirements.txt') as f:
10+
install_requirements = f.read().splitlines()
11+
with open('dev-requirements.txt') as f:
12+
test_requirements = f.read().splitlines()
2013

21-
test_requirements = [
22-
# TODO: put package test requirements here
23-
]
2414

2515
setup(
2616
name='python-lambda-4dn',
2717
version=pkg_version,
2818
description="FORKED for 4dn-dcic. Use to package and deploy lambda functions.",
2919
long_description=readme,
3020
long_description_content_type='text/x-rst',
31-
author="Carl Vitzthum, Soo Lee",
32-
author_email='carl_vitzthum@hms.harvard.edu',
21+
author="4DN Team at Harvard Medical School",
22+
author_email='william_ronchetti@hms.harvard.edu',
3323
url='https://github.com/4dn-dcic/python-lambda',
3424
packages=find_packages(),
3525
include_package_data=True,
@@ -38,17 +28,11 @@
3828
zip_safe=False,
3929
keywords='python-lambda',
4030
classifiers=[
41-
'Development Status :: 2 - Pre-Alpha',
31+
'Development Status :: 4 - Beta',
4232
'Intended Audience :: Developers',
43-
'License :: OSI Approved :: ISC License (ISCL)',
33+
'License :: OSI Approved :: MIT License',
4434
'Natural Language :: English',
45-
"Programming Language :: Python :: 2",
46-
'Programming Language :: Python :: 2.6',
47-
'Programming Language :: Python :: 2.7',
48-
'Programming Language :: Python :: 3',
49-
'Programming Language :: Python :: 3.3',
50-
'Programming Language :: Python :: 3.4',
51-
'Programming Language :: Python :: 3.5',
35+
'Programming Language :: Python :: 3.6',
5236
],
5337
test_suite='tests',
5438
tests_require=test_requirements

0 commit comments

Comments
 (0)