Skip to content

Commit

Permalink
Merge pull request #147 from ndem0/master
Browse files Browse the repository at this point in the history
Update to version 1.1
  • Loading branch information
ndem0 authored Apr 4, 2018
2 parents b96b22b + 81c0afa commit bbb5147
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions LICENSE.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ License

The MIT License (MIT)

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

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


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.
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.
6 changes: 3 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@

# General information about the project.
project = u'PyGeM'
copyright = u'2016, Filippo Salmoiraghi, Marco Tezzele'
author = u'Filippo Salmoiraghi, Marco Tezzele'
copyright = u'2016-2018, PyGeM contributors'
author = u'PyGeM contributors'

# autoclass
autoclass_content = 'both'
Expand All @@ -81,7 +81,7 @@
# built documents.
#
# The short X.Y version.
version = '1.0'
version = '1.1'
# The full version, including alpha/beta/rc tags.
release = version

Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ def readme():

setup(
name='pygem',
version='0.2',
version='1.1',
description='Tools for gemetrical morphing.',
long_description=readme(),
classifiers=[
'Development Status :: 4 - Beta',
'Development Status :: 5 - Production/Stable',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 2.7',
'Intended Audience :: Science/Research',
Expand All @@ -28,7 +28,7 @@ def readme():
license='MIT',
packages=find_packages(),
install_requires=[
'numpy', 'numpy-stl', 'scipy', 'matplotlib', 'vtk', 'enum34',
'numpy', 'numpy-stl', 'enum34', 'scipy', 'matplotlib', 'vtk',
'Sphinx==1.4', 'sphinx_rtd_theme'
],
test_suite='nose.collector',
Expand Down

0 comments on commit bbb5147

Please sign in to comment.