Skip to content
This repository has been archived by the owner on Feb 12, 2020. It is now read-only.

Commit

Permalink
Update license and add proper dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
wichert committed Oct 15, 2008
1 parent fa74f00 commit e73fa3b
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 244 deletions.
3 changes: 2 additions & 1 deletion docs/HISTORY.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ Changelog
1.0 - Unreleased
----------------

* ?
* Move to svn.zope.org and relicense under ZPL.
[wichert]


1.0rc1 - July 15, 2008
Expand Down
222 changes: 0 additions & 222 deletions docs/LICENSE.GPL

This file was deleted.

43 changes: 43 additions & 0 deletions docs/LICENSE.ZPL
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
Some code carries the Zope Public License (as indicated in the comments):

Zope Public License (ZPL) Version 2.0

This software is Copyright (c) Zope Corporation (tm) and Contributors.
All rights reserved.

This license has been certified as open source. It has also been designated as
GPL compatible by the Free Software Foundation (FSF).

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions in 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.
* The name Zope Corporation (tm) must not be used to endorse or promote
products derived from this software without prior written permission from
Zope Corporation.
* The right to distribute this software or to use it for any purpose does not
give you the right to use Servicemarks (sm) or Trademarks (tm) of Zope
Corporation. Use of them is covered in a separate agreement
(see http://www.zope.com/Marks).
If any files are modified, you must cause the modified files to carry prominent
notices stating that you changed the files and the date of any change.

Disclaimer
THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS'' AND ANY EXPRESSED 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 ZOPE CORPORATION OR ITS 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.

This software consists of contributions made by Zope Corporation and many
individuals on behalf of Zope Corporation. Specific attributions are listed
in the accompanying credits file.
17 changes: 0 additions & 17 deletions docs/LICENSE.txt

This file was deleted.

10 changes: 6 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,25 @@
long_description=open("README.txt").read() + "\n" +
open(os.path.join("docs", "HISTORY.txt")).read(),
classifiers=[
"Environment :: Web Environment",
"Framework :: Zope2",
"License :: OSI Approved :: Zope Public License",
"Programming Language :: Python",
"Topic :: Software Development :: Libraries :: Python Modules",
],
keywords='',
author='Wichert Akkerman',
author_email='wichert@wiggy.net',
license='GPL',
license='ZPL',
packages=find_packages(exclude=['ez_setup']),
namespace_packages=['plone'],
include_package_data=True,
zip_safe=False,
install_requires=[
'setuptools',
# 'zope.event',
# 'zope.interface',
# 'zope.component',
'zope.event',
'zope.interface',
'zope.component',
],
entry_points="""
""",
Expand Down

0 comments on commit e73fa3b

Please sign in to comment.