Skip to content

Commit 0dec675

Browse files
authored
Merge pull request #397 from jmadler/master
Update docs for v0.17.x release; Reintroduce Py26 and Py33 compat
2 parents bee0f3b + dadf17b commit 0dec675

File tree

16 files changed

+81
-46
lines changed

16 files changed

+81
-46
lines changed

.travis.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ cache: pip
44

55
matrix:
66
include:
7+
- python: 2.6
8+
env: TOXENV=py26
79
- python: 2.7
810
env: TOXENV=py27
11+
- python: 3.3
12+
env: TOXENV=py33
913
- python: 3.4
1014
env: TOXENV=py34
1115
- python: 3.5
@@ -18,7 +22,10 @@ matrix:
1822
sudo: required # required for Python 3.7 (travis-ci/travis-ci#9069)
1923

2024
install:
21-
- pip install tox
25+
- pip install tox==2.9.1
26+
- pip install virtualenv==15.2.0
27+
- pip install py==1.4.30
28+
- pip install pluggy==0.5.2
2229

2330
before_script:
2431
# Run flake8 tests only on Python 2.7 and 3.7...

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2013-2016 Python Charmers Pty Ltd, Australia
1+
Copyright (c) 2013-2018 Python Charmers Pty Ltd, Australia
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

README.rst

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,12 +264,14 @@ For more info, see :ref:`translation`.
264264
Licensing
265265
---------
266266

267-
:Author: Ed Schofield
267+
:Author: Ed Schofield, Jordan M. Adler, et al
268268

269-
:Copyright: 2013-2016 Python Charmers Pty Ltd, Australia.
269+
:Copyright: 2013-2018 Python Charmers Pty Ltd, Australia.
270270

271-
:Sponsor: Python Charmers Pty Ltd, Australia, and Python Charmers Pte
272-
Ltd, Singapore. http://pythoncharmers.com
271+
:Sponsors: Python Charmers Pty Ltd, Australia, and Python Charmers Pte
272+
Ltd, Singapore. http://pythoncharmers.com
273+
274+
Pinterest https://opensource.pinterest.com/
273275

274276
:Licence: MIT. See ``LICENSE.txt`` or `here <http://python-future.org/credits.html>`_.
275277

docs/compatible_idioms.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Cheat Sheet: Writing Python 2-3 compatible code
44
===============================================
55

6-
- **Copyright (c):** 2013-2016 Python Charmers Pty Ltd, Australia.
6+
- **Copyright (c):** 2013-2018 Python Charmers Pty Ltd, Australia.
77
- **Author:** Ed Schofield.
88
- **Licence:** Creative Commons Attribution.
99

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
# General information about the project.
5353
project = u'Python-Future'
54-
copyright = u'2013-2016, Python Charmers Pty Ltd, Australia'
54+
copyright = u'2013-2018, Python Charmers Pty Ltd, Australia'
5555

5656
# The version info for the project you're documenting, acts as replacement for
5757
# |version| and |release|, also used in various other places throughout the

docs/credits.rst

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Licence
88
The software is distributed under an MIT licence. The text is as follows
99
(from ``LICENSE.txt``)::
1010

11-
Copyright (c) 2013-2016 Python Charmers Pty Ltd, Australia
11+
Copyright (c) 2013-2018 Python Charmers Pty Ltd, Australia
1212

1313
Permission is hereby granted, free of charge, to any person obtaining a copy
1414
of this software and associated documentation files (the "Software"), to deal
@@ -30,33 +30,33 @@ The software is distributed under an MIT licence. The text is as follows
3030

3131
.. _sponsor:
3232

33-
Sponsor
34-
-------
33+
Sponsors
34+
--------
3535
Python Charmers Pty Ltd, Australia, and Python Charmers Pte Ltd, Singapore.
3636
http://pythoncharmers.com
3737

38+
Pinterest https://opensource.pinterest.com/
3839

3940
.. _authors:
4041

42+
Maintainer
43+
----------
44+
Python-Future is currently maintained by Jordan M. Adler <[email protected]>.
45+
4146
Authors
4247
-------
48+
Python-Future is largely written by Ed Schofield <[email protected]> with the help of various contributors:
4349

44-
Python-Future is written and maintained by Ed Schofield with the help of
45-
various contributors:
46-
47-
Development Lead
48-
~~~~~~~~~~~~~~~~
49-
50-
- Ed Schofield <[email protected]>
51-
52-
Patches
53-
~~~~~~~
54-
50+
- Grant Bakker
5551
- Jacob Beck
52+
- Nate Bogdanowicz
5653
- Denis Cornehl
5754
- Nicolas Delaby
55+
- Jon Dufresne
5856
- Corey Farwell
5957
- Eric Firing
58+
- Maximilian Hils
59+
- Martijn Jacobs
6060
- Michael Joseph
6161
- Waldemar Kornewald
6262
- Alexey Kotlyarov
@@ -65,26 +65,37 @@ Patches
6565
- Joshua Landau
6666
- German Larrain
6767
- Chris Lasher
68+
- Calum Lind
69+
- Jon Parise
70+
- Matthew Parnell
71+
- Miga Purg
72+
- Éloi Rivard
6873
- Elliott Sales de Andrade
74+
- Yury Selivanov
6975
- Tim Shaffer
76+
- Louis Sautier
7077
- Daniel Szoska
78+
- Flaviu Tamas
7179
- Jeff Tratner
7280
- Tim Tröndle
7381
- Brad Walker
74-
- Mystic-Mirage (GitHub)
75-
- str4d (GitHub)
76-
- 9seconds (GitHub)
77-
- Varriount (GitHub)
82+
- cclaus (GiHub user)
83+
- lsm (GiHub user)
84+
- Mystic-Mirage (GitHub user)
85+
- str4d (GitHub user)
86+
- 9seconds (GitHub user)
87+
- Varriount (GitHub user)
7888

7989
Suggestions and Feedback
8090
~~~~~~~~~~~~~~~~~~~~~~~~
8191

8292
- Chris Adams
8393
- Martijn Faassen
94+
- Joe Gordon
8495
- Lion Krischer
8596
- Danielle Madeley
8697
- Val Markovic
87-
- wluebbe (GitHub)
98+
- wluebbe (GitHub user)
8899

89100

90101
Other Credits

docs/notebooks/Writing Python 2-3 compatible code.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"cell_type": "markdown",
1212
"metadata": {},
1313
"source": [
14-
"- **Copyright (c):** 2013-2016 Python Charmers Pty Ltd, Australia.\n",
14+
"- **Copyright (c):** 2013-2018 Python Charmers Pty Ltd, Australia.\n",
1515
"- **Author:** Ed Schofield.\n",
1616
"- **Licence:** Creative Commons Attribution.\n",
1717
"\n",

docs/whatsnew.rst

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,25 @@
33
What's New
44
**********
55

6-
.. _whats-new-0.16.x:
7-
8-
What's new in version 0.16.1 (unreleased)
6+
What's new in version 0.17 (2018-10-19)
97
=========================================
108

11-
This is a minor bug-fix release:
12-
13-
- Fix `from collections import ChainMap` after install_aliases() (issue #226)
14-
9+
This is a major bug-fix release, including:
10+
11+
- Fix ``from collections import ChainMap`` after install_aliases() (issue #226)
12+
- Fix multiple import from ``__future__`` bug in futurize (issue #113)
13+
- Add support for proper %s formatting of newbytes
14+
- Properly implement iterator protocol for newrange object
15+
- Fix ``past.translation`` on read-only file systems
16+
- Fix Tkinter import bug introduced in Python 2.7.4 (issue #262)
17+
- Correct TypeError to ValueError in a specific edge case for newrange
18+
- Support inequality tests betwen newstrs and newbytes
19+
- Add type check to __get__ in newsuper
20+
- Fix fix_divsion_safe to support better conversion of complex expressions, and
21+
skip obvious float division.
22+
23+
As well as a number of corrections to a variety of documentation, and updates to
24+
test infrastructure.
1525

1626
What's new in version 0.16.0 (2016-10-27)
1727
==========================================

futurize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
1414
Licensing
1515
---------
16-
Copyright 2013-2016 Python Charmers Pty Ltd, Australia.
16+
Copyright 2013-2018 Python Charmers Pty Ltd, Australia.
1717
The software is distributed under an MIT licence. See LICENSE.txt.
1818
"""
1919

pasteurize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
1313
Licensing
1414
---------
15-
Copyright 2013-2016 Python Charmers Pty Ltd, Australia.
15+
Copyright 2013-2018 Python Charmers Pty Ltd, Australia.
1616
The software is distributed under an MIT licence. See LICENSE.txt.
1717
"""
1818

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,10 @@
9696
CLASSIFIERS = [
9797
"Programming Language :: Python",
9898
"Programming Language :: Python :: 2",
99+
"Programming Language :: Python :: 2.6",
99100
"Programming Language :: Python :: 2.7",
100101
"Programming Language :: Python :: 3",
102+
"Programming Language :: Python :: 3.3",
101103
"Programming Language :: Python :: 3.4",
102104
"Programming Language :: Python :: 3.5",
103105
"Programming Language :: Python :: 3.6",
@@ -174,7 +176,7 @@
174176
packages=PACKAGES,
175177
package_data=PACKAGE_DATA,
176178
include_package_data=True,
177-
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
179+
python_requires=">=2.6, !=3.0.*, !=3.1.*, !=3.2.*",
178180
classifiers=CLASSIFIERS,
179181
**setup_kwds
180182
)

src/future/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@
7676
7777
Licensing
7878
---------
79-
Copyright 2013-2016 Python Charmers Pty Ltd, Australia.
79+
Copyright 2013-2018 Python Charmers Pty Ltd, Australia.
8080
The software is distributed under an MIT licence. See LICENSE.txt.
8181
8282
"""
8383

8484
__title__ = 'future'
8585
__author__ = 'Ed Schofield'
8686
__license__ = 'MIT'
87-
__copyright__ = 'Copyright 2013-2016 Python Charmers Pty Ltd'
87+
__copyright__ = 'Copyright 2013-2018 Python Charmers Pty Ltd'
8888
__ver_major__ = 0
8989
__ver_minor__ = 17
9090
__ver_patch__ = 0

src/future/backports/misc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@ def __delitem__(self, key):
817817
try:
818818
del self.maps[0][key]
819819
except KeyError:
820-
raise KeyError('Key not found in the first mapping: {!r}'.format(key))
820+
raise KeyError('Key not found in the first mapping: {0!r}'.format(key))
821821

822822
def popitem(self):
823823
'Remove and return an item pair from maps[0]. Raise KeyError is maps[0] is empty.'
@@ -831,7 +831,7 @@ def pop(self, key, *args):
831831
try:
832832
return self.maps[0].pop(key, *args)
833833
except KeyError:
834-
raise KeyError('Key not found in the first mapping: {!r}'.format(key))
834+
raise KeyError('Key not found in the first mapping: {0!r}'.format(key))
835835

836836
def clear(self):
837837
'Clear maps[0], leaving maps[1:] intact.'

src/past/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
8181
Licensing
8282
---------
83-
Copyright 2013-2016 Python Charmers Pty Ltd, Australia.
83+
Copyright 2013-2018 Python Charmers Pty Ltd, Australia.
8484
The software is distributed under an MIT licence. See LICENSE.txt.
8585
"""
8686

tests/test_future/test_futurize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,7 @@ def total_count(self):
11941194
11951195
x = 3 / 2
11961196
y = 3. / 2
1197-
foo = range(100)
1197+
foo = list(range(100))
11981198
assert x == 1 and isinstance(x, int)
11991199
assert y == 1.5 and isinstance(y, float)
12001200
a = 1 + foo[len(foo) / 2]

tox.ini

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
[tox]
2-
envlist = py27,py34,py35,py36,py37
2+
envlist = py26,py27,py33,py34,py35,py36,py37
33

44
[testenv]
5-
deps = pytest
5+
deps =
6+
pytest
7+
unittest2
8+
py26: importlib
69
commands = pytest {posargs}

0 commit comments

Comments
 (0)