From ac5d131394970b7ddb866b0517613834c3ab1bb8 Mon Sep 17 00:00:00 2001 From: evandbrown Date: Mon, 22 Jul 2013 13:42:02 -0700 Subject: [PATCH 1/4] Create LICENSE --- LICENSE | 191 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ac5bf0f --- /dev/null +++ b/LICENSE @@ -0,0 +1,191 @@ +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright +owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities +that control, are controlled by, or are under common control with that entity. +For the purposes of this definition, "control" means (i) the power, direct or +indirect, to cause the direction or management of such entity, whether by +contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the +outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including +but not limited to software source code, documentation source, and configuration +files. + +"Object" form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object code, +generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made +available under the License, as indicated by a copyright notice that is included +in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative Works +shall not include works that remain separable from, or merely link (or bind by +name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version +of the Work and any modifications or additions to that Work or Derivative Works +thereof, that is intentionally submitted to Licensor for inclusion in the Work +by the copyright owner or by an individual or Legal Entity authorized to submit +on behalf of the copyright owner. For the purposes of this definition, +"submitted" means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and +issue tracking systems that are managed by, or on behalf of, the Licensor for +the purpose of discussing and improving the Work, but excluding communication +that is conspicuously marked or otherwise designated in writing by the copyright +owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by combination +of their Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this License +for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works thereof +in any medium, with or without modifications, and in Source or Object form, +provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of +this License; and +You must cause any modified files to carry prominent notices stating that You +changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, +all copyright, patent, trademark, and attribution notices from the Source form +of the Work, excluding those notices that do not pertain to any part of the +Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of the +following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents of +the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. +You may add Your own copyright statement to Your modifications and may provide +additional or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as a whole, +provided Your use, reproduction, and distribution of the Work otherwise complies +with the conditions stated in this License. + +5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of +any separate license agreement you may have executed with Licensor regarding +such Contributions. + +6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides the +Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, +including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, incidental, +or consequential damages of any character arising as a result of this License or +out of the use or inability to use the Work (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has +been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. However, +in accepting such obligations, You may act only on Your own behalf and on Your +sole responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work + +To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets "[]" replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included on +the same "printed page" as the copyright notice for easier identification within +third-party archives. + + Copyright 2013 Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From 6fb5f6aee7798fe7f9bcafbcef4b07cfe89f694e Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 21 Apr 2015 13:33:53 -0700 Subject: [PATCH 2/4] Update --- .ebextensions/python.config | 15 ++++++--------- .gitignore | 5 +++++ application.py | 2 +- requirements.txt | 5 +---- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.ebextensions/python.config b/.ebextensions/python.config index 3350e96..98e0ca1 100644 --- a/.ebextensions/python.config +++ b/.ebextensions/python.config @@ -1,10 +1,7 @@ option_settings: - - namespace: aws:elasticbeanstalk:container:python:staticfiles - option_name: /static/ - value: static/ - - option_name: FLASK_DEBUG - value: true - - option_name: APP_VERSION - value: v1.2.0 - - option_name: ENABLE_COOL_NEW_FEATURE - value: false \ No newline at end of file + aws:elasticbeanstalk:container:python:staticfiles + /static/: static/ + aws:elasticbeanstalk:application:environment: + FLASK_DEBUG: true + APP_VERSION: v1.2.0 + ENABLE_COOL_NEW_FEATURE: false diff --git a/.gitignore b/.gitignore index 85cb0b7..1998607 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ release/ *.pyc .elasticbeanstalk/ + +# Elastic Beanstalk Files +.elasticbeanstalk/* +!.elasticbeanstalk/*.cfg.yml +!.elasticbeanstalk/*.global.yml diff --git a/application.py b/application.py index d67a0a4..c341375 100644 --- a/application.py +++ b/application.py @@ -22,4 +22,4 @@ def hello_world(): enable_cool_new_feature=enable_cool_new_feature) if __name__ == '__main__': - application.run(host='0.0.0.0') \ No newline at end of file + application.run(host='0.0.0.0') diff --git a/requirements.txt b/requirements.txt index 767a218..e3e9a71 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1 @@ -Flask==0.10.1 -Jinja2==2.7 -Werkzeug==0.9.1 -wsgiref==0.1.2 \ No newline at end of file +Flask From 48d61293e0868e0cf4e80e044d32399730f2561e Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 21 Apr 2015 13:39:32 -0700 Subject: [PATCH 3/4] Add config.global.yml for use with the EB CLI --- .elasticbeanstalk/config.global.yml | 3 +++ .gitignore | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .elasticbeanstalk/config.global.yml diff --git a/.elasticbeanstalk/config.global.yml b/.elasticbeanstalk/config.global.yml new file mode 100644 index 0000000..cee9e23 --- /dev/null +++ b/.elasticbeanstalk/config.global.yml @@ -0,0 +1,3 @@ +global: + application_name: eb-python-flask + default_platform: Python 3.4 diff --git a/.gitignore b/.gitignore index 1998607..8779944 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ release/ *.pyc -.elasticbeanstalk/ # Elastic Beanstalk Files .elasticbeanstalk/* From 6e239aad3dab719857cf357578edaaa6671e5252 Mon Sep 17 00:00:00 2001 From: Una Alexia Karlsen Date: Fri, 24 Jul 2015 09:54:21 +0200 Subject: [PATCH 4/4] fixed typos in python.config Replaced tabs with spaces so that it is not valid yaml Added a colon --- .ebextensions/python.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ebextensions/python.config b/.ebextensions/python.config index 98e0ca1..e74278c 100644 --- a/.ebextensions/python.config +++ b/.ebextensions/python.config @@ -1,7 +1,7 @@ option_settings: - aws:elasticbeanstalk:container:python:staticfiles + aws:elasticbeanstalk:container:python:staticfiles: /static/: static/ aws:elasticbeanstalk:application:environment: FLASK_DEBUG: true - APP_VERSION: v1.2.0 - ENABLE_COOL_NEW_FEATURE: false + APP_VERSION: v1.2.0 + ENABLE_COOL_NEW_FEATURE: false