diff --git a/LICENSE b/LICENSE index 71fd5a469..7a4da8bd6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2013 OpenSlides Team +Copyright (c) 2011-2014 OpenSlides Team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/extras/win32-portable/create_portable.txt b/extras/win32-portable/create_portable.txt index 54e3eff8c..9a87492df 100644 --- a/extras/win32-portable/create_portable.txt +++ b/extras/win32-portable/create_portable.txt @@ -7,7 +7,7 @@ How to create a new portable Windows distribution of OpenSlides: 2. Install all required python packages (see requirements_production.txt): - easy_install -Z django django-mptt beautifulsoup4 bleach jsonfield natsort reportlab setuptools sockjs_tornado tornado backports.ssl_match_hostname django-haystack whoosh + easy_install -Z django backports.ssl_match_hostname beautifulsoup4 bleach django-haystack django-mptt jsonfield natsort reportlab setuptools sockjs_tornado tornado whoosh 3. Install pywin32 from binary installer: diff --git a/extras/win32-portable/licenses/backports.ssl_match_hostname b/extras/win32-portable/licenses/backports.ssl_match_hostname new file mode 100644 index 000000000..58058f1bb --- /dev/null +++ b/extras/win32-portable/licenses/backports.ssl_match_hostname @@ -0,0 +1,51 @@ +Python License (Python-2.0) + +Python License, Version 2 (Python-2.0) + +PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 +-------------------------------------------- + +1. This LICENSE AGREEMENT is between the Python Software Foundation +("PSF"), and the Individual or Organization ("Licensee") accessing and +otherwise using this software ("Python") in source or binary form and +its associated documentation. + +2. Subject to the terms and conditions of this License Agreement, PSF +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python +alone or in any derivative version, provided, however, that PSF's +License Agreement and PSF's notice of copyright, i.e., "Copyright (c) +2001-2013 Python Software Foundation; All Rights Reserved" are retained in +Python alone or in any derivative version prepared by Licensee. + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python. + +4. PSF is making Python available to Licensee on an "AS IS" +basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between PSF and +Licensee. This License Agreement does not grant permission to use PSF +trademarks or trade name in a trademark sense to endorse or promote +products or services of Licensee, or any third party. + +8. By copying, installing or otherwise using Python, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. diff --git a/extras/win32-portable/licenses/jsonfield b/extras/win32-portable/licenses/jsonfield new file mode 100644 index 000000000..46bbd542a --- /dev/null +++ b/extras/win32-portable/licenses/jsonfield @@ -0,0 +1,20 @@ +Copyright (c) 2012 Brad Jasper + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/extras/win32-portable/licenses/openslides b/extras/win32-portable/licenses/openslides index 3e586374d..b4e337dc3 100644 --- a/extras/win32-portable/licenses/openslides +++ b/extras/win32-portable/licenses/openslides @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2013 OpenSlides Team +Copyright (c) 2011-2014 OpenSlides Team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/extras/win32-portable/licenses/pillow b/extras/win32-portable/licenses/pillow deleted file mode 100644 index de227e42e..000000000 --- a/extras/win32-portable/licenses/pillow +++ /dev/null @@ -1,25 +0,0 @@ -The Python Imaging Library is - -Copyright (c) 1997-2009 by Secret Labs AB -Copyright (c) 1995-2009 by Fredrik Lundh - -By obtaining, using, and/or copying this software and/or its -associated documentation, you agree that you have read, understood, -and will comply with the following terms and conditions: - -Permission to use, copy, modify, and distribute this software and its -associated documentation for any purpose and without fee is hereby -granted, provided that the above copyright notice appears in all -copies, and that both that copyright notice and this permission notice -appear in supporting documentation, and that the name of Secret Labs -AB or the author not be used in advertising or publicity pertaining to -distribution of the software without specific, written prior -permission. - -SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO -THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR -ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/extras/win32-portable/licenses/six b/extras/win32-portable/licenses/six new file mode 100644 index 000000000..d76e02426 --- /dev/null +++ b/extras/win32-portable/licenses/six @@ -0,0 +1,18 @@ +Copyright (c) 2010-2014 Benjamin Peterson + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/extras/win32-portable/openslides.exe b/extras/win32-portable/openslides.exe index adc7f6a71..fed0eb63a 100644 Binary files a/extras/win32-portable/openslides.exe and b/extras/win32-portable/openslides.exe differ diff --git a/extras/win32-portable/prepare_portable.py b/extras/win32-portable/prepare_portable.py index 4d2697e22..54e82c2ef 100755 --- a/extras/win32-portable/prepare_portable.py +++ b/extras/win32-portable/prepare_portable.py @@ -91,7 +91,14 @@ SITE_PACKAGES = { ], }, "setuptools": { - "copy": ["pkg_resources.py"], + "copy": [ + "setuptools", + "easy_install.py", + "pkg_resources.py" + ], + }, + "six": { + "copy": ["six.py"], }, "sockjs-tornado": { "copy": ["sockjs"], diff --git a/requirements_production.txt b/requirements_production.txt index f6726c425..2745c22dd 100644 --- a/requirements_production.txt +++ b/requirements_production.txt @@ -1,16 +1,16 @@ # Requirements for OpenSlides in production in alphabetical order Django>=1.5,<1.7 beautifulsoup4>=4.3,<4.4 -bleach>=1.2,<1.3 +bleach>=1.2,<1.5 django-haystack>=2.1,<2.2 django-mptt>=0.6,<0.7 jsonfield>=0.9,<0.10 natsort>=3.1,<3.2 reportlab>=2.7,<2.8 -setuptools>=2.1,<2.2 +setuptools>=2.1,<3.5 sockjs-tornado>=1.0,<1.1 tornado>=3.1,<3.3 -whoosh>=2.5,<2.6 +whoosh>=2.5.6,<2.6 # For Python 2.6 support --allow-external argparse