[Python-checkins] python/nondist/peps pep-0314.txt,1.15,1.16
akuchling at users.sourceforge.net
akuchling at users.sourceforge.net
Thu Feb 3 03:27:05 CET 2005
Update of /cvsroot/python/python/nondist/peps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10708
Modified Files:
pep-0314.txt
Log Message:
Add Richard Jones's edits
Index: pep-0314.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0314.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- pep-0314.txt 14 May 2003 17:12:55 -0000 1.15
+++ pep-0314.txt 3 Feb 2005 02:27:01 -0000 1.16
@@ -81,15 +81,13 @@
Platform (multiple use)
A comma-separated list of platform specifications, summarizing
- the operating systems supported by the package. The major
- supported platforms are listed below, but this list is
- necessarily incomplete.
-
- POSIX, MacOS, Windows, BeOS, PalmOS.
+ the operating systems supported by the package which are not
+ listed in the "Operating System" Trove classifiers. See
+ "Classifier" below.
Example:
- Platform: POSIX, Windows
+ Platform: ObscureUnix, RareDOS
Supported-Platform (multiple use)
@@ -183,53 +181,15 @@
License
- A string selected from a short list of choices, specifying the
- license covering the package. Some licenses result in the
- software being freely redistributable, so packagers and
- resellers can automatically know that they're free to
- redistribute the software. Other licenses will require
- a careful reading by a human to determine how the software can be
- repackaged and resold.
-
- The choices are:
-
- Artistic, BSD, DFSG, GNU GPL, GNU LGPL, "MIT",
- Mozilla PL, "public domain", Python, Qt PL, Zope PL, unknown,
- nocommercial, nosell, nosource, shareware, other
-
- Definitions of some of the licenses are:
-
- DFSG The license conforms to the Debian Free Software
- Guidelines, but does not use one of the other
- DFSG conforming licenses listed here.
- More information is available at:
- http://www.debian.org/social_contract#guidelines
-
- Python Python 1.6 or higher license. Version 1.5.2 and
- earlier are under the MIT license.
-
- public domain Software is public domain, not copyrighted.
- unknown Status is not known
- nocommercial Free private use but commercial use not permitted
- nosell Free use but distribution for profit by arrangement
- nosource Freely distributable but no source code
- shareware Payment is requested if software is used
- other General category for other non-DFSG licenses
-
- Some of these licenses can be interpreted to mean the software is
- freely redistributable. The list of redistributable licenses is:
-
- Artistic, BSD, DFSG, GNU GPL, GNU LGPL, "MIT",
- Mozilla PL, "public domain", Python, Qt PL, Zope PL,
- nosource, shareware
-
- Note that being redistributable does not mean a package
- qualifies as free software, 'nosource' and 'shareware' being
- examples.
+ Text indicating the license covering the package where the license
+ is not a selection from the "License" Trove classifiers. See
+ "Classifier" below.
Example:
- License: MIT
+ License: This software may only be obtained by sending the
+ author a postcard, and then the user promises not
+ to redistribute it.
Classifier (multiple use)
@@ -244,14 +204,13 @@
Requires (multiple use)
- Each entry contains a string describing some other component or
- module required by this package.
+ Each entry contains a string describing some other module or
+ package required by this package.
- The format of a requirement string is simple: an arbitrary
- sequence of characters, optionally followed by a version
- declaration within parentheses. Leading and trailing whitespace
- are ignored, and whitespace within the string is normalized to a
- single space.
+ The format of a requirement string is simple: an module or
+ package name, optionally followed by a version declaration within
+ parentheses. Leading and trailing whitespace are ignored, and
+ whitespace within the string is normalized to a single space.
A version declaration is a series of conditional operators and
version numbers, separated by commas. Conditional operators
@@ -266,7 +225,7 @@
the string ">1.0, !=1.3.4, <2.0" is a legal version declaration.
All of the following are possible requirement strings: "rfc822",
- "zlib (>=1.1.4)", "XML parser".
+ "zlib (>=1.1.4)", "zope".
There's no canonical list of what strings should be used; the
Python community is left to choose its own standards.
@@ -277,11 +236,11 @@
Requires: sys
Requires: zlib
Requires: pyexpat (>1.0)
- Requires: DB-API 2.0 module
+ Requires: psycopg
Provides (multiple use)
- Each entry contains a string describing a component or
+ Each entry contains a string describing a package or
module that will be provided by this package once it is
installed. These strings should match the ones used in
Requirements fields. Version declarations cannot be supplied;
@@ -296,7 +255,7 @@
Obsoletes (multiple use)
- Each entry contains a string describing a component or module
+ Each entry contains a string describing a package or module
that this package renders obsolete, meaning that the two packages
should not be installed at the same time. Version declarations
can be supplied.
@@ -310,20 +269,6 @@
Obsoletes: Gorgon
- Conflicts (multiple use)
-
- Each entry contains a string describing a component or module
- that conflicts with this package, meaning that the two packages
- should not be installed at the same time. Version declarations
- can be supplied.
-
- Conflict resolution probably isn't very important for Python
- programs, because few extensions will cause problems for other
- extensions, unless they happen to be using the same package
- name. This field name is being defined here for future use.
-
- Conflicts: Gorgon
-
Summary of Differences From PEP 241
@@ -336,8 +281,7 @@
Open issues
- With the addition of the 'Classifiers' field, should the Platform
- and License fields be removed?
+ None.
Acknowledgements
More information about the Python-checkins
mailing list