Skip to content

Commit bbb5147

Browse files
authored
Merge pull request #147 from ndem0/master
Update to version 1.1
2 parents b96b22b + 81c0afa commit bbb5147

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

LICENSE.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ License
33

44
The MIT License (MIT)
55

6-
Copyright (c) 2016-2017 by Filippo Salmoiraghi and Marco Tezzele.
6+
Copyright (c) 2016-2018 PyGeM contributors
77

88
Permission is hereby granted, free of charge, to any person obtaining a copy
99
of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +16,4 @@ The above copyright notice and this permission notice shall be included in all
1616
copies or substantial portions of the Software.
1717

1818

19-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
19+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

docs/source/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070

7171
# General information about the project.
7272
project = u'PyGeM'
73-
copyright = u'2016, Filippo Salmoiraghi, Marco Tezzele'
74-
author = u'Filippo Salmoiraghi, Marco Tezzele'
73+
copyright = u'2016-2018, PyGeM contributors'
74+
author = u'PyGeM contributors'
7575

7676
# autoclass
7777
autoclass_content = 'both'
@@ -81,7 +81,7 @@
8181
# built documents.
8282
#
8383
# The short X.Y version.
84-
version = '1.0'
84+
version = '1.1'
8585
# The full version, including alpha/beta/rc tags.
8686
release = version
8787

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ def readme():
1111

1212
setup(
1313
name='pygem',
14-
version='0.2',
14+
version='1.1',
1515
description='Tools for gemetrical morphing.',
1616
long_description=readme(),
1717
classifiers=[
18-
'Development Status :: 4 - Beta',
18+
'Development Status :: 5 - Production/Stable',
1919
'License :: OSI Approved :: MIT License',
2020
'Programming Language :: Python :: 2.7',
2121
'Intended Audience :: Science/Research',
@@ -28,7 +28,7 @@ def readme():
2828
license='MIT',
2929
packages=find_packages(),
3030
install_requires=[
31-
'numpy', 'numpy-stl', 'scipy', 'matplotlib', 'vtk', 'enum34',
31+
'numpy', 'numpy-stl', 'enum34', 'scipy', 'matplotlib', 'vtk',
3232
'Sphinx==1.4', 'sphinx_rtd_theme'
3333
],
3434
test_suite='nose.collector',

0 commit comments

Comments
 (0)