浏览代码

Merge branch 'master' of https://github.com/buxx/synergine2

Bastien Sevajol 6 年前
父节点
当前提交
f62b226983
共有 2 个文件被更改,包括 23 次插入2 次删除
  1. 21 0
      LICENSE
  2. 2 2
      requirements.txt

+ 21 - 0
LICENSE 查看文件

@@ -0,0 +1,21 @@
1
+MIT License
2
+
3
+Copyright (c) 2018 Bastien Sevajol
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 all
13
+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 THE
21
+SOFTWARE.

+ 2 - 2
requirements.txt 查看文件

@@ -6,7 +6,7 @@ future==0.16.0
6 6
 numpy==1.14.5
7 7
 pluggy==0.6.0
8 8
 psutil==5.4.6
9
-py==1.5.3
9
+py==1.5.4
10 10
 pyglet==1.3.2
11 11
 pytest==3.6.2
12 12
 python-dateutil==2.7.3
@@ -15,4 +15,4 @@ redis==2.10.6
15 15
 six==1.11.0
16 16
 tmx==1.9.1
17 17
 pytest-mock==1.10.0
18
-Pillow==5.1.0
18
+Pillow==5.2.0