Skip to content

Commit 848c092

Browse files
PiDelportPiDelport
authored
Merge pull request #5 from pjdelport/updates-Python-3.6
Updates & Python 3.6 support
2 parents 2027135 + 1f148e5 commit 848c092

File tree

5 files changed

+270
-6
lines changed

5 files changed

+270
-6
lines changed

‎.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ matrix:
66
- { python: '2.7', env: TOXENV=py27 }
77
- { python: '3.4', env: TOXENV=py34 }
88
- { python: '3.5', env: TOXENV=py35 }
9+
- { python: '3.6', env: TOXENV=py36 }
910
- { python: 'pypy', env: TOXENV=pypy }
1011
- { python: 'pypy3', env: TOXENV=pypy3 }
1112

1213
# Report coverage for the latest Python 2 and 3 versions
1314
- { python: '2.7', env: TOXENV=py27-codecov }
14-
- { python: '3.5', env: TOXENV=py35-codecov }
15+
- { python: '3.6', env: TOXENV=py36-codecov }
1516

1617
allow_failures:
1718
# PyPy3 on Travis seems to be broken, as of 2016-02.

‎LICENSE

+255
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,255 @@
1+
A. HISTORY OF THE SOFTWARE
2+
==========================
3+
4+
Python was created in the early 1990s by Guido van Rossum at Stichting
5+
Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
6+
as a successor of a language called ABC. Guido remains Python's
7+
principal author, although it includes many contributions from others.
8+
9+
In 1995, Guido continued his work on Python at the Corporation for
10+
National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
11+
in Reston, Virginia where he released several versions of the
12+
software.
13+
14+
In May 2000, Guido and the Python core development team moved to
15+
BeOpen.com to form the BeOpen PythonLabs team. In October of the same
16+
year, the PythonLabs team moved to Digital Creations (now Zope
17+
Corporation, see http://www.zope.com). In 2001, the Python Software
18+
Foundation (PSF, see http://www.python.org/psf/) was formed, a
19+
non-profit organization created specifically to own Python-related
20+
Intellectual Property. Zope Corporation is a sponsoring member of
21+
the PSF.
22+
23+
All Python releases are Open Source (see http://www.opensource.org for
24+
the Open Source Definition). Historically, most, but not all, Python
25+
releases have also been GPL-compatible; the table below summarizes
26+
the various releases.
27+
28+
Release Derived Year Owner GPL-
29+
from compatible? (1)
30+
31+
0.9.0 thru 1.2 1991-1995 CWI yes
32+
1.3 thru 1.5.2 1.2 1995-1999 CNRI yes
33+
1.6 1.5.2 2000 CNRI no
34+
2.0 1.6 2000 BeOpen.com no
35+
1.6.1 1.6 2001 CNRI yes (2)
36+
2.1 2.0+1.6.1 2001 PSF no
37+
2.0.1 2.0+1.6.1 2001 PSF yes
38+
2.1.1 2.1+2.0.1 2001 PSF yes
39+
2.1.2 2.1.1 2002 PSF yes
40+
2.1.3 2.1.2 2002 PSF yes
41+
2.2 and above 2.1.1 2001-now PSF yes
42+
43+
Footnotes:
44+
45+
(1) GPL-compatible doesn't mean that we're distributing Python under
46+
the GPL. All Python licenses, unlike the GPL, let you distribute
47+
a modified version without making your changes open source. The
48+
GPL-compatible licenses make it possible to combine Python with
49+
other software that is released under the GPL; the others don't.
50+
51+
(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
52+
because its license has a choice of law clause. According to
53+
CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
54+
is "not incompatible" with the GPL.
55+
56+
Thanks to the many outside volunteers who have worked under Guido's
57+
direction to make these releases possible.
58+
59+
60+
B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
61+
===============================================================
62+
63+
PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
64+
--------------------------------------------
65+
66+
1. This LICENSE AGREEMENT is between the Python Software Foundation
67+
("PSF"), and the Individual or Organization ("Licensee") accessing and
68+
otherwise using this software ("Python") in source or binary form and
69+
its associated documentation.
70+
71+
2. Subject to the terms and conditions of this License Agreement, PSF hereby
72+
grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
73+
analyze, test, perform and/or display publicly, prepare derivative works,
74+
distribute, and otherwise use Python alone or in any derivative version,
75+
provided, however, that PSF's License Agreement and PSF's notice of copyright,
76+
i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
77+
2011, 2012, 2013, 2014, 2015, 2016, 2017 Python Software Foundation; All Rights
78+
Reserved" are retained in Python alone or in any derivative version prepared by
79+
Licensee.
80+
81+
3. In the event Licensee prepares a derivative work that is based on
82+
or incorporates Python or any part thereof, and wants to make
83+
the derivative work available to others as provided herein, then
84+
Licensee hereby agrees to include in any such work a brief summary of
85+
the changes made to Python.
86+
87+
4. PSF is making Python available to Licensee on an "AS IS"
88+
basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
89+
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
90+
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
91+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
92+
INFRINGE ANY THIRD PARTY RIGHTS.
93+
94+
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
95+
FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
96+
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
97+
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
98+
99+
6. This License Agreement will automatically terminate upon a material
100+
breach of its terms and conditions.
101+
102+
7. Nothing in this License Agreement shall be deemed to create any
103+
relationship of agency, partnership, or joint venture between PSF and
104+
Licensee. This License Agreement does not grant permission to use PSF
105+
trademarks or trade name in a trademark sense to endorse or promote
106+
products or services of Licensee, or any third party.
107+
108+
8. By copying, installing or otherwise using Python, Licensee
109+
agrees to be bound by the terms and conditions of this License
110+
Agreement.
111+
112+
113+
BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
114+
-------------------------------------------
115+
116+
BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
117+
118+
1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
119+
office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
120+
Individual or Organization ("Licensee") accessing and otherwise using
121+
this software in source or binary form and its associated
122+
documentation ("the Software").
123+
124+
2. Subject to the terms and conditions of this BeOpen Python License
125+
Agreement, BeOpen hereby grants Licensee a non-exclusive,
126+
royalty-free, world-wide license to reproduce, analyze, test, perform
127+
and/or display publicly, prepare derivative works, distribute, and
128+
otherwise use the Software alone or in any derivative version,
129+
provided, however, that the BeOpen Python License is retained in the
130+
Software, alone or in any derivative version prepared by Licensee.
131+
132+
3. BeOpen is making the Software available to Licensee on an "AS IS"
133+
basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
134+
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
135+
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
136+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
137+
INFRINGE ANY THIRD PARTY RIGHTS.
138+
139+
4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
140+
SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
141+
AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
142+
DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
143+
144+
5. This License Agreement will automatically terminate upon a material
145+
breach of its terms and conditions.
146+
147+
6. This License Agreement shall be governed by and interpreted in all
148+
respects by the law of the State of California, excluding conflict of
149+
law provisions. Nothing in this License Agreement shall be deemed to
150+
create any relationship of agency, partnership, or joint venture
151+
between BeOpen and Licensee. This License Agreement does not grant
152+
permission to use BeOpen trademarks or trade names in a trademark
153+
sense to endorse or promote products or services of Licensee, or any
154+
third party. As an exception, the "BeOpen Python" logos available at
155+
http://www.pythonlabs.com/logos.html may be used according to the
156+
permissions granted on that web page.
157+
158+
7. By copying, installing or otherwise using the software, Licensee
159+
agrees to be bound by the terms and conditions of this License
160+
Agreement.
161+
162+
163+
CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
164+
---------------------------------------
165+
166+
1. This LICENSE AGREEMENT is between the Corporation for National
167+
Research Initiatives, having an office at 1895 Preston White Drive,
168+
Reston, VA 20191 ("CNRI"), and the Individual or Organization
169+
("Licensee") accessing and otherwise using Python 1.6.1 software in
170+
source or binary form and its associated documentation.
171+
172+
2. Subject to the terms and conditions of this License Agreement, CNRI
173+
hereby grants Licensee a nonexclusive, royalty-free, world-wide
174+
license to reproduce, analyze, test, perform and/or display publicly,
175+
prepare derivative works, distribute, and otherwise use Python 1.6.1
176+
alone or in any derivative version, provided, however, that CNRI's
177+
License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
178+
1995-2001 Corporation for National Research Initiatives; All Rights
179+
Reserved" are retained in Python 1.6.1 alone or in any derivative
180+
version prepared by Licensee. Alternately, in lieu of CNRI's License
181+
Agreement, Licensee may substitute the following text (omitting the
182+
quotes): "Python 1.6.1 is made available subject to the terms and
183+
conditions in CNRI's License Agreement. This Agreement together with
184+
Python 1.6.1 may be located on the Internet using the following
185+
unique, persistent identifier (known as a handle): 1895.22/1013. This
186+
Agreement may also be obtained from a proxy server on the Internet
187+
using the following URL: http://hdl.handle.net/1895.22/1013".
188+
189+
3. In the event Licensee prepares a derivative work that is based on
190+
or incorporates Python 1.6.1 or any part thereof, and wants to make
191+
the derivative work available to others as provided herein, then
192+
Licensee hereby agrees to include in any such work a brief summary of
193+
the changes made to Python 1.6.1.
194+
195+
4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
196+
basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
197+
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
198+
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
199+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
200+
INFRINGE ANY THIRD PARTY RIGHTS.
201+
202+
5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
203+
1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
204+
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
205+
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
206+
207+
6. This License Agreement will automatically terminate upon a material
208+
breach of its terms and conditions.
209+
210+
7. This License Agreement shall be governed by the federal
211+
intellectual property law of the United States, including without
212+
limitation the federal copyright law, and, to the extent such
213+
U.S. federal law does not apply, by the law of the Commonwealth of
214+
Virginia, excluding Virginia's conflict of law provisions.
215+
Notwithstanding the foregoing, with regard to derivative works based
216+
on Python 1.6.1 that incorporate non-separable material that was
217+
previously distributed under the GNU General Public License (GPL), the
218+
law of the Commonwealth of Virginia shall govern this License
219+
Agreement only as to issues arising under or with respect to
220+
Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this
221+
License Agreement shall be deemed to create any relationship of
222+
agency, partnership, or joint venture between CNRI and Licensee. This
223+
License Agreement does not grant permission to use CNRI trademarks or
224+
trade name in a trademark sense to endorse or promote products or
225+
services of Licensee, or any third party.
226+
227+
8. By clicking on the "ACCEPT" button where indicated, or by copying,
228+
installing or otherwise using Python 1.6.1, Licensee agrees to be
229+
bound by the terms and conditions of this License Agreement.
230+
231+
ACCEPT
232+
233+
234+
CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
235+
--------------------------------------------------
236+
237+
Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
238+
The Netherlands. All rights reserved.
239+
240+
Permission to use, copy, modify, and distribute this software and its
241+
documentation for any purpose and without fee is hereby granted,
242+
provided that the above copyright notice appear in all copies and that
243+
both that copyright notice and this permission notice appear in
244+
supporting documentation, and that the name of Stichting Mathematisch
245+
Centrum or CWI not be used in advertising or publicity pertaining to
246+
distribution of the software without specific, written prior
247+
permission.
248+
249+
STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
250+
THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
251+
FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
252+
FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
253+
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
254+
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
255+
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

‎README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ under the backports_ namespace.
2727
Supported Python versions
2828
=========================
2929

30-
* CPython: 2.7, 3.4, 3.5
30+
* CPython: 2.7, 3.4, 3.5, 3.6
3131
* PyPy
3232

3333

‎setup.py

+9-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
from setuptools import setup, find_packages
44

55

6+
def README():
7+
with open('README.rst') as f:
8+
return f.read()
9+
10+
611
# Backward-compatibility dependencies for Python 2
712
_python2_requires = [
813
'future', # For backport of surrogateescape
@@ -12,9 +17,10 @@
1217
setup(
1318
name='backports.os',
1419
description="Backport of new features in Python's os module",
20+
long_description=README(),
1521
url='https://github.com/pjdelport/backports.os',
1622

17-
author=u'Piët Delport',
23+
author='Pi Delport',
1824
author_email='[email protected]',
1925

2026
package_dir={'': 'src'},
@@ -35,6 +41,8 @@
3541
'Programming Language :: Python :: 3',
3642
'Programming Language :: Python :: 3.4',
3743
'Programming Language :: Python :: 3.5',
44+
'Programming Language :: Python :: 3.6',
45+
'Programming Language :: Python :: Implementation :: PyPy',
3846
'Topic :: Software Development :: Libraries :: Python Modules',
3947
],
4048
)

‎tox.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# See: https://github.com/codecov/codecov-python#using-tox
88

99
[tox]
10-
envlist = py{27,34,35,py}
10+
envlist = py{27,34,35,36,py}
1111

1212
[testenv]
1313
passenv = TOXENV CI TRAVIS TRAVIS_*
@@ -28,8 +28,8 @@ commands =
2828
# XXX: This will currently run the tests twice under codecov, but oh well.
2929
# TODO: Use a factor-based override or negation for this sometime?
3030
# See:
31-
# https://bitbucket.org/hpk42/tox/issues/189/allow-parametrization-of-any-testenv
32-
# https://bitbucket.org/hpk42/tox/issues/292/negated-factor-conditions
31+
# https://github.com/tox-dev/tox/issues/189
32+
# https://github.com/tox-dev/tox/issues/292
3333
python -m unittest discover tests
3434

3535
codecov: coverage run -m unittest discover tests

0 commit comments

Comments
 (0)