diff --git a/CHANGES.txt b/CHANGES.txt index e3e4378..0ecacec 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,9 @@ -v1.2.0, XX/XX/XX -- TBD +v1.2.0, 09/18/20 -- search for GAMS in more places, especially on Windows + gdxpds.gdx.GdxSymbol.unload method for user-directed memory managment + convenience functions gdxpds.gdx.append_set and append_parameter + special value handling moved to its own module + clarifying that Python 2.X is not longer supported + general documentation, pylint, and testing improvements v1.1.0, 10/09/18 -- fixes to_dataframes and to_gdx memory leaks, respects GAMS_DIR environment variable, additional bug and warning fixes. GdxSymbol.dataframe can now be set just using the diff --git a/LICENSE b/LICENSE index 2f2a467..33eadc9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2018, Alliance for Sustainable Energy. +Copyright (c) 2020, Alliance for Sustainable Energy. All rights reserved. Redistribution and use in source and binary forms, diff --git a/doc/source/conf.py b/doc/source/conf.py index c489aa7..6ae179a 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -22,7 +22,7 @@ import gdxpds project = 'gdx-pandas' -copyright = '2018, Alliance for Sustainable Energy' +copyright = '2020, Alliance for Sustainable Energy' author = 'Elaine T. Hale' # The short X.Y version diff --git a/gdxpds/__init__.py b/gdxpds/__init__.py index 76553e0..7e7f948 100644 --- a/gdxpds/__init__.py +++ b/gdxpds/__init__.py @@ -1,5 +1,5 @@ # [LICENSE] -# Copyright (c) 2018, Alliance for Sustainable Energy. +# Copyright (c) 2020, Alliance for Sustainable Energy. # All rights reserved. # # Redistribution and use in source and binary forms, diff --git a/gdxpds/gdx.py b/gdxpds/gdx.py index 80fc153..ab043a0 100644 --- a/gdxpds/gdx.py +++ b/gdxpds/gdx.py @@ -1,5 +1,5 @@ # [LICENSE] -# Copyright (c) 2018, Alliance for Sustainable Energy. +# Copyright (c) 2020, Alliance for Sustainable Energy. # All rights reserved. # # Redistribution and use in source and binary forms, diff --git a/gdxpds/test/conftest.py b/gdxpds/test/conftest.py index 37bcb45..3169b8c 100644 --- a/gdxpds/test/conftest.py +++ b/gdxpds/test/conftest.py @@ -1,3 +1,40 @@ +# [LICENSE] +# Copyright (c) 2020, Alliance for Sustainable Energy. +# All rights reserved. +# +# Redistribution and use in source and binary forms, +# with or without modification, are permitted provided +# that the following conditions are met: +# +# 1. Redistributions of source code must retain the above +# copyright notice, this list of conditions and the +# following disclaimer. +# +# 2. Redistributions in binary form must reproduce the +# above copyright notice, this list of conditions and the +# following disclaimer in the documentation and/or other +# materials provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the +# names of its contributors may be used to endorse or +# promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# [/LICENSE] + import pytest def pytest_addoption(parser): diff --git a/gdxpds/test/test_conversions.py b/gdxpds/test/test_conversions.py index 4fb27df..e2b0f8a 100644 --- a/gdxpds/test/test_conversions.py +++ b/gdxpds/test/test_conversions.py @@ -1,5 +1,5 @@ # [LICENSE] -# Copyright (c) 2018, Alliance for Sustainable Energy. +# Copyright (c) 2020, Alliance for Sustainable Energy. # All rights reserved. # # Redistribution and use in source and binary forms, diff --git a/gdxpds/test/test_read.py b/gdxpds/test/test_read.py index d270d18..368bda8 100644 --- a/gdxpds/test/test_read.py +++ b/gdxpds/test/test_read.py @@ -1,5 +1,5 @@ # [LICENSE] -# Copyright (c) 2018, Alliance for Sustainable Energy. +# Copyright (c) 2020, Alliance for Sustainable Energy. # All rights reserved. # # Redistribution and use in source and binary forms, diff --git a/gdxpds/test/test_session.py b/gdxpds/test/test_session.py index 9f5c3c4..1c5eda4 100644 --- a/gdxpds/test/test_session.py +++ b/gdxpds/test/test_session.py @@ -1,5 +1,5 @@ # [LICENSE] -# Copyright (c) 2018, Alliance for Sustainable Energy. +# Copyright (c) 2020, Alliance for Sustainable Energy. # All rights reserved. # # Redistribution and use in source and binary forms, diff --git a/gdxpds/test/test_specials.py b/gdxpds/test/test_specials.py index 075f258..fa17785 100644 --- a/gdxpds/test/test_specials.py +++ b/gdxpds/test/test_specials.py @@ -1,5 +1,5 @@ # [LICENSE] -# Copyright (c) 2018, Alliance for Sustainable Energy. +# Copyright (c) 2020, Alliance for Sustainable Energy. # All rights reserved. # # Redistribution and use in source and binary forms, diff --git a/gdxpds/test/test_write.py b/gdxpds/test/test_write.py index 451441c..57ed94f 100644 --- a/gdxpds/test/test_write.py +++ b/gdxpds/test/test_write.py @@ -1,3 +1,40 @@ +# [LICENSE] +# Copyright (c) 2020, Alliance for Sustainable Energy. +# All rights reserved. +# +# Redistribution and use in source and binary forms, +# with or without modification, are permitted provided +# that the following conditions are met: +# +# 1. Redistributions of source code must retain the above +# copyright notice, this list of conditions and the +# following disclaimer. +# +# 2. Redistributions in binary form must reproduce the +# above copyright notice, this list of conditions and the +# following disclaimer in the documentation and/or other +# materials provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the +# names of its contributors may be used to endorse or +# promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# [/LICENSE] + from ctypes import c_bool import copy import logging diff --git a/gdxpds/write_gdx.py b/gdxpds/write_gdx.py index ae080a7..6bb65c5 100644 --- a/gdxpds/write_gdx.py +++ b/gdxpds/write_gdx.py @@ -1,5 +1,5 @@ # [LICENSE] -# Copyright (c) 2018, Alliance for Sustainable Energy. +# Copyright (c) 2020, Alliance for Sustainable Energy. # All rights reserved. # # Redistribution and use in source and binary forms, diff --git a/setup.py b/setup.py index 84bea7c..8daa674 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ # [LICENSE] -# Copyright (c) 2018, Alliance for Sustainable Energy. +# Copyright (c) 2020, Alliance for Sustainable Energy. # All rights reserved. # # Redistribution and use in source and binary forms,