merge dev to master (#28)

* Add License

* Update push_test_cbc.yml

only run 2 tests since CBC is too slow for many tests

* Bump urllib3 from 1.22 to 1.24.2

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.22 to 1.24.2.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/master/CHANGES.rst)
- [Commits](urllib3/urllib3@1.22...1.24.2)

Signed-off-by: dependabot[bot] <[email protected]>

* Bump requests from 2.11.1 to 2.20.0

Bumps [requests](https://github.com/requests/requests) from 2.11.1 to 2.20.0.
- [Release notes](https://github.com/requests/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/master/HISTORY.md)
- [Commits](psf/requests@v2.11.1...v2.20.0)

Signed-off-by: dependabot[bot] <[email protected]>

* removed Project/Manifest.toml from root directory

* update push_test.yml to docker exec tests

was docker-compose exec -T

* bug fix: add input_file/LoadProfiles

* bug fix: add log directory

* bug fix: add ssc.so for sscapi on linux

* improve debug message from check_common_outputs

* rm obsolete "Check the Outputs folder" msg

* add complete ssc.so

* adding licensing info

Co-authored-by: Sakshi Mishra <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Josiah Pohl <[email protected]>

.github/workflows/push_test_cbc.yml

@@ -26,4 +26,4 @@ jobs:
       - name: Check django logs
         run: docker logs django
       - name: test
-        run: docker-compose exec -T celery python manage.py test -v 2 --failfast --no-input
+        run: docker-compose exec -T celery python manage.py test reo.tests.test_blended_rate reo.tests.test_demand_ratchet -v 2 --failfast --no-input

.github/workflows/push_tests.yml

@@ -28,4 +28,4 @@ jobs:
       - name: Check django logs
         run: docker logs django
       - name: test
-        run: docker-compose exec -T celery python manage.py test -v 2 --failfast --no-input
+        run: docker exec celery python manage.py test -v 2 --failfast --no-input

.gitignore

@@ -5,15 +5,13 @@ __pycache__/
 
 keys.py
 .idea
-input_files/
-!input_files/LoadProfiles/
+input_files/*
+!input_files/**/
+!input_files/LoadProfiles/**/
 .DS_Store
 urdb_rate_errors/
 outage_sizing/
 
-# C extensions
-*.so
-
 # Distribution / packaging
 .Python
 env/
@@ -98,7 +96,8 @@ ENV/
 *.sqlite3
 
 /tmp/*
-/log/*
+/log/**
+!/log/.gitkeep
 static/files/*
 !static/files/.gitkeep
 
@@ -110,10 +109,6 @@ all_data*
 # CHP results processing
 results_processing/*
 
-# Docker
-docker_setup/solver_install_files/xpress_files
-docker_share/
-
 # Math Forumlation Latex
 docs/formulation/*aux
 docs/formulation/*log

LICENSE

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2020, National Renewable Energy Laboratory
+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.

ez_setup.py

@@ -1,3 +1,32 @@
+# *********************************************************************************
+# REopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# Redistributions of source code must retain the above copyright notice, this list
+# of conditions and the following disclaimer.
+#
+# 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.
+#
+# 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.
+# *********************************************************************************
 #!/usr/bin/env python
 
 """