diff --git a/README.md b/README.md index 4c65714..e58a99f 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Please check [https://physical-validation.readthedocs.io](http://physical-validation.readthedocs.io) for the full reference. -`physical_validation` largely incorporates the functionality of +`physical_validation` incorporates the functionality of [checkensemble](https://github.com/shirtsgroup/checkensemble). This software is developed in the Shirts group at University of diff --git a/physical_validation/__init__.py b/physical_validation/__init__.py index 401a233..178dfd5 100644 --- a/physical_validation/__init__.py +++ b/physical_validation/__init__.py @@ -16,12 +16,12 @@ """ __author__ = "Pascal T. Merz, and Michael R. Shirts" -__copyright__ = "2017" +__copyright__ = "2017-2021" __credits__ = [] # TODO: -__license__ = "LGPLv2.1" -__maintainer__ = "Michael R. Shirts" -__email__ = "michael.shirts@colorado.edu" +__license__ = "MIT" +__maintainer__ = "Pascal T. Merz, and Michael R. Shirts" +__email__ = "pascal.merz@me.com, michael.shirts@colorado.edu" from . import data, ensemble, integrator, kinetic_energy, util from ._version import get_versions diff --git a/physical_validation/tests/test_system_database/Water900/system.py b/physical_validation/tests/test_system_database/Water900/system.py index bf03df5..05d3246 100644 --- a/physical_validation/tests/test_system_database/Water900/system.py +++ b/physical_validation/tests/test_system_database/Water900/system.py @@ -3,26 +3,11 @@ # physical_validation, # # a python package to test the physical validity of MD results # # # -# Written by Michael R. Shirts # -# Pascal T. Merz # +# Written by Pascal T. Merz # +# Michael R. Shirts # # # -# Copyright (C) 2012 University of Virginia # -# (C) 2017 University of Colorado Boulder # -# # -# This library is free software; you can redistribute it and/or # -# modify it under the terms of the GNU Lesser General Public # -# License as published by the Free Software Foundation; either # -# version 2.1 of the License, or (at your option) any later version. # -# # -# This library is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # -# Lesser General Public License for more details. # -# # -# You should have received a copy of the GNU Lesser General Public # -# License along with this library; if not, write to the # -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # -# Boston, MA 02110-1301 USA # +# Copyright (c) 2017-2021 University of Colorado Boulder # +# (c) 2012 The University of Virginia # # # ########################################################################### r""" diff --git a/physical_validation/tests/test_system_database/database.py b/physical_validation/tests/test_system_database/database.py index ef54035..16bf8bf 100644 --- a/physical_validation/tests/test_system_database/database.py +++ b/physical_validation/tests/test_system_database/database.py @@ -3,26 +3,11 @@ # physical_validation, # # a python package to test the physical validity of MD results # # # -# Written by Michael R. Shirts # -# Pascal T. Merz # +# Written by Pascal T. Merz # +# Michael R. Shirts # # # -# Copyright (C) 2012 University of Virginia # -# (C) 2017 University of Colorado Boulder # -# # -# This library is free software; you can redistribute it and/or # -# modify it under the terms of the GNU Lesser General Public # -# License as published by the Free Software Foundation; either # -# version 2.1 of the License, or (at your option) any later version. # -# # -# This library is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # -# Lesser General Public License for more details. # -# # -# You should have received a copy of the GNU Lesser General Public # -# License along with this library; if not, write to the # -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # -# Boston, MA 02110-1301 USA # +# Copyright (c) 2017-2021 University of Colorado Boulder # +# (c) 2012 The University of Virginia # # # ########################################################################### r""" diff --git a/physical_validation/tests/test_system_database/system.py b/physical_validation/tests/test_system_database/system.py index 4b7ca08..2faff55 100644 --- a/physical_validation/tests/test_system_database/system.py +++ b/physical_validation/tests/test_system_database/system.py @@ -3,26 +3,11 @@ # physical_validation, # # a python package to test the physical validity of MD results # # # -# Written by Michael R. Shirts # -# Pascal T. Merz # +# Written by Pascal T. Merz # +# Michael R. Shirts # # # -# Copyright (C) 2012 University of Virginia # -# (C) 2017 University of Colorado Boulder # -# # -# This library is free software; you can redistribute it and/or # -# modify it under the terms of the GNU Lesser General Public # -# License as published by the Free Software Foundation; either # -# version 2.1 of the License, or (at your option) any later version. # -# # -# This library is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # -# Lesser General Public License for more details. # -# # -# You should have received a copy of the GNU Lesser General Public # -# License along with this library; if not, write to the # -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # -# Boston, MA 02110-1301 USA # +# Copyright (c) 2017-2021 University of Colorado Boulder # +# (c) 2012 The University of Virginia # # # ########################################################################### r""" diff --git a/setup.py b/setup.py index 345416c..d04b93f 100644 --- a/setup.py +++ b/setup.py @@ -22,13 +22,13 @@ setup( name='physical_validation', author='Pascal T. Merz and Michael R. Shirts', - author_email='pascal.merz@colorado.edu, michael.shirts@colorado.edu', + author_email='pascal.merz@me.com, michael.shirts@colorado.edu', description=short_description[0], long_description=long_description, long_description_content_type="text/markdown", version=versioneer.get_version(), cmdclass=versioneer.get_cmdclass(), - license="LGPLv2.1", + license="MIT", # Which Python importable modules should be included when your package is installed # Handled automatically by setuptools. Use 'exclude' to prevent some specific @@ -57,9 +57,9 @@ }, classifiers=[ - 'Development Status :: 4 - Beta', + 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Science/Research', - 'License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2)', + 'License :: OSI Approved :: MIT License', 'Natural Language :: English', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6',