Skip to content

Commit

Permalink
Merge pull request #81 from NREL/add_set_parameter_helpers
Browse files Browse the repository at this point in the history
Update CHANGES.txt and headers in preparation for release
  • Loading branch information
elainethale authored Sep 18, 2020
2 parents e8ba080 + 1083606 commit 6a0c635
Show file tree
Hide file tree
Showing 13 changed files with 90 additions and 11 deletions.
7 changes: 6 additions & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gdxpds/__init__.py
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion gdxpds/gdx.py
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
37 changes: 37 additions & 0 deletions gdxpds/test/conftest.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
2 changes: 1 addition & 1 deletion gdxpds/test/test_conversions.py
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion gdxpds/test/test_read.py
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion gdxpds/test/test_session.py
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion gdxpds/test/test_specials.py
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
37 changes: 37 additions & 0 deletions gdxpds/test/test_write.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion gdxpds/write_gdx.py
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -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,
Expand Down

0 comments on commit 6a0c635

Please sign in to comment.