Visitar URL original
Merge remote-tracking branch 'upstream/master' · DylanVB/winpython@0aa9628 · GitHub
Skip to content

Commit 0aa9628

Browse files
author
stonebig
committed
Merge remote-tracking branch 'upstream/master'
2 parents 336bdb9 + 0bdd508 commit 0aa9628

16 files changed

Lines changed: 26 additions & 23 deletions

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Copyright (c) 2012-2014 Pierre Raybaut
2-
Copyright (c) 2014-2016 The Winpython development team https://github.com/winpython/
2+
Copyright (c) 2014-2017 The Winpython development team https://github.com/winpython/
33

44
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:
55

‎README.rst‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ WinPython tools
33

44
Copyright © 2012-2013 Pierre Raybaut
55

6-
Copyright © 2014-2016 The Winpython development team https://github.com/winpython/
6+
Copyright © 2014-2017 The Winpython development team https://github.com/winpython/
77

88
Licensed under the terms of the MIT License
99
(see winpython/__init__.py for details)
@@ -45,6 +45,9 @@ Requirements
4545
* NSIS:
4646
* "Large strings" special build (http://nsis.sourceforge.net/Special_Builds)
4747
* with TextReplace plugin installed
48+
49+
* PyQt4/5 is required to execute WinPython Control Panel/Ipython Qt and Qt related packages for both WinPython 2.x and 3.x releases.
50+
if not installed, these packages will not execute.
4851

4952
Installation
5053
------------

‎changelogs/WinPythonQt5-3.4.4.6.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ Name | Version | Description
218218
[snowballstemmer](http://pypi.python.org/pypi/snowballstemmer) | 1.2.1 | This package provides 16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms.
219219
[sortedcollections](http://pypi.python.org/pypi/sortedcollections) | 0.4.2 | Python Sorted Collections
220220
[sortedcontainers](http://pypi.python.org/pypi/sortedcontainers) | 1.5.7 | Python Sorted Container Types: SortedList, SortedDict, and SortedSet
221-
[sounddevice](http://pypi.python.org/pypi/sounddevice) | 0.3.6 | Python Sorted Container Types: SortedList, SortedDict, and SortedSet
221+
[sounddevice](http://pypi.python.org/pypi/sounddevice) | 0.3.6 | Play and Record Sound with Python
222222
[sphinx](http://pypi.python.org/pypi/sphinx) | 1.5.1 | Tool for generating documentation which uses reStructuredText as its markup language
223223
[sphinx_rtd_theme](http://pypi.python.org/pypi/sphinx_rtd_theme) | 0.1.9 | ReadTheDocs.org theme for Sphinx, 2013 version.
224224
[spyder](http://pypi.python.org/pypi/spyder) | 3.1.2 | Scientific PYthon Development EnviRonment: designed for interactive computing and data visualisation with a simple and intuitive user interface
@@ -251,4 +251,4 @@ Name | Version | Description
251251
[xlrd](http://pypi.python.org/pypi/xlrd) | 1.0.0 | Extract data from Microsoft Excel spreadsheet files
252252
[xlsxwriter](http://pypi.python.org/pypi/xlsxwriter) | 0.9.5 | A Python module for creating Excel XLSX files.
253253
[zarr](http://pypi.python.org/pypi/zarr) | 2.1.4 | A minimal implementation of chunked, compressed, N-dimensional arrays for Python.
254-
[zict](http://pypi.python.org/pypi/zict) | 0.1.1 | Mutable mapping tools
254+
[zict](http://pypi.python.org/pypi/zict) | 0.1.1 | Mutable mapping tools

‎changelogs/WinPythonQt5-3.4.4.6_History.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ New packages:
2323
* [snakeviz](http://pypi.python.org/pypi/snakeviz) 0.4.1 (An in-browser Python profile viewer)
2424
* [sortedcollections](http://pypi.python.org/pypi/sortedcollections) 0.4.2 (Python Sorted Collections)
2525
* [sortedcontainers](http://pypi.python.org/pypi/sortedcontainers) 1.5.7 (Python Sorted Container Types: SortedList, SortedDict, and SortedSet)
26-
* [sounddevice](http://pypi.python.org/pypi/sounddevice) 0.3.6 (Python Sorted Container Types: SortedList, SortedDict, and SortedSet)
26+
* [sounddevice](http://pypi.python.org/pypi/sounddevice) 0.3.6 (Play and Record Sound with Python)
2727
* [testpath](http://pypi.python.org/pypi/testpath) 0.3 (Test utilities for code working with files and commands)
2828
2929
Upgraded packages:

‎changelogs/WinPythonQt5-3.5.3.0.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ Name | Version | Description
219219
[snowballstemmer](http://pypi.python.org/pypi/snowballstemmer) | 1.2.1 | This package provides 16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms.
220220
[sortedcollections](http://pypi.python.org/pypi/sortedcollections) | 0.4.2 | Python Sorted Collections
221221
[sortedcontainers](http://pypi.python.org/pypi/sortedcontainers) | 1.5.7 | Python Sorted Container Types: SortedList, SortedDict, and SortedSet
222-
[sounddevice](http://pypi.python.org/pypi/sounddevice) | 0.3.6 | Python Sorted Container Types: SortedList, SortedDict, and SortedSet
222+
[sounddevice](http://pypi.python.org/pypi/sounddevice) | 0.3.6 | Play and Record Sound with Python
223223
[sphinx](http://pypi.python.org/pypi/sphinx) | 1.5.1 | Tool for generating documentation which uses reStructuredText as its markup language
224224
[sphinx_rtd_theme](http://pypi.python.org/pypi/sphinx_rtd_theme) | 0.1.9 | ReadTheDocs.org theme for Sphinx, 2013 version.
225225
[spyder](http://pypi.python.org/pypi/spyder) | 3.1.2 | Scientific PYthon Development EnviRonment: designed for interactive computing and data visualisation with a simple and intuitive user interface
@@ -252,4 +252,4 @@ Name | Version | Description
252252
[xlrd](http://pypi.python.org/pypi/xlrd) | 1.0.0 | Extract data from Microsoft Excel spreadsheet files
253253
[xlsxwriter](http://pypi.python.org/pypi/xlsxwriter) | 0.9.5 | A Python module for creating Excel XLSX files.
254254
[zarr](http://pypi.python.org/pypi/zarr) | 2.1.4 | A minimal implementation of chunked, compressed, N-dimensional arrays for Python.
255-
[zict](http://pypi.python.org/pypi/zict) | 0.1.1 | Mutable mapping tools
255+
[zict](http://pypi.python.org/pypi/zict) | 0.1.1 | Mutable mapping tools

‎changelogs/WinPythonQt5-3.5.3.0_History.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The following changes were made to WinPython distribution since version 3.5.2.3Q
66
77
New packages:
88
9-
* [bleach](http://pypi.python.org/pypi/bleach) 1.5.0 (An easy whitelist-based HTML-sanitizing tool) * [chardet](http://pypi.python.org/pypi/chardet) 2.3.0 (Universal encoding detector for Python 2 and 3) * [fuzzywuzzy](http://pypi.python.org/pypi/fuzzywuzzy) 0.14.0 (Fuzzy string matching in python) * [imageio](http://pypi.python.org/pypi/imageio) 2.1.1 (Library for reading and writing a wide range of image, video, scientific, and volumetric data formats.) * [metakernel](http://pypi.python.org/pypi/metakernel) 0.18.2 (Metakernel for Jupyter) * [nbdime](http://pypi.python.org/pypi/nbdime) 0.1.2 (Tools for diffing and merging of Jupyter notebooks) * [octave_kernel](http://pypi.python.org/pypi/octave_kernel) 0.23.2 (A Jupyter kernel for Octave.) * [olefile](http://pypi.python.org/pypi/olefile) 0.44 (Python package to parse, read and write Microsoft OLE2 files) * [pandocfilters](http://pypi.python.org/pypi/pandocfilters) 1.4.1 (Utilities for writing pandoc filters in python) * [pexpect](http://pypi.python.org/pypi/pexpect) 4.2.1 (Pexpect allows easy control of interactive console applications.) * [ptyprocess](http://pypi.python.org/pypi/ptyprocess) 0.5.1 (Run a subprocess in a pseudo terminal) * [python_levenshtein](http://pypi.python.org/pypi/python_levenshtein) 0.12.0 (Python extension for computing string edit distances and similarities) * [requests_ftp](http://pypi.python.org/pypi/requests_ftp) 0.3.1 (FTP Transport Adapter for Requests.) * [s3transfer](http://pypi.python.org/pypi/s3transfer) 0.1.10 (An Amazon S3 Transfer Manager) * [scikit_fuzzy](http://pypi.python.org/pypi/scikit_fuzzy) 0.3.dev0 (Fuzzy logic toolkit for SciPy) * [snakeviz](http://pypi.python.org/pypi/snakeviz) 0.4.1 (An in-browser Python profile viewer) * [sortedcollections](http://pypi.python.org/pypi/sortedcollections) 0.4.2 (Python Sorted Collections) * [sortedcontainers](http://pypi.python.org/pypi/sortedcontainers) 1.5.7 (Python Sorted Container Types: SortedList, SortedDict, and SortedSet) * [sounddevice](http://pypi.python.org/pypi/sounddevice) 0.3.6 (Python Sorted Container Types: SortedList, SortedDict, and SortedSet) * [testpath](http://pypi.python.org/pypi/testpath) 0.3 (Test utilities for code working with files and commands)
9+
* [bleach](http://pypi.python.org/pypi/bleach) 1.5.0 (An easy whitelist-based HTML-sanitizing tool) * [chardet](http://pypi.python.org/pypi/chardet) 2.3.0 (Universal encoding detector for Python 2 and 3) * [fuzzywuzzy](http://pypi.python.org/pypi/fuzzywuzzy) 0.14.0 (Fuzzy string matching in python) * [imageio](http://pypi.python.org/pypi/imageio) 2.1.1 (Library for reading and writing a wide range of image, video, scientific, and volumetric data formats.) * [metakernel](http://pypi.python.org/pypi/metakernel) 0.18.2 (Metakernel for Jupyter) * [nbdime](http://pypi.python.org/pypi/nbdime) 0.1.2 (Tools for diffing and merging of Jupyter notebooks) * [octave_kernel](http://pypi.python.org/pypi/octave_kernel) 0.23.2 (A Jupyter kernel for Octave.) * [olefile](http://pypi.python.org/pypi/olefile) 0.44 (Python package to parse, read and write Microsoft OLE2 files) * [pandocfilters](http://pypi.python.org/pypi/pandocfilters) 1.4.1 (Utilities for writing pandoc filters in python) * [pexpect](http://pypi.python.org/pypi/pexpect) 4.2.1 (Pexpect allows easy control of interactive console applications.) * [ptyprocess](http://pypi.python.org/pypi/ptyprocess) 0.5.1 (Run a subprocess in a pseudo terminal) * [python_levenshtein](http://pypi.python.org/pypi/python_levenshtein) 0.12.0 (Python extension for computing string edit distances and similarities) * [requests_ftp](http://pypi.python.org/pypi/requests_ftp) 0.3.1 (FTP Transport Adapter for Requests.) * [s3transfer](http://pypi.python.org/pypi/s3transfer) 0.1.10 (An Amazon S3 Transfer Manager) * [scikit_fuzzy](http://pypi.python.org/pypi/scikit_fuzzy) 0.3.dev0 (Fuzzy logic toolkit for SciPy) * [snakeviz](http://pypi.python.org/pypi/snakeviz) 0.4.1 (An in-browser Python profile viewer) * [sortedcollections](http://pypi.python.org/pypi/sortedcollections) 0.4.2 (Python Sorted Collections) * [sortedcontainers](http://pypi.python.org/pypi/sortedcontainers) 1.5.7 (Python Sorted Container Types: SortedList, SortedDict, and SortedSet) * [sounddevice](http://pypi.python.org/pypi/sounddevice) 0.3.6 (Play and Record Sound with Python) * [testpath](http://pypi.python.org/pypi/testpath) 0.3 (Test utilities for code working with files and commands)
1010
1111
Upgraded packages:
1212

‎changelogs/WinPythonQt5-3.6.0.1.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ Name | Version | Description
218218
[snowballstemmer](http://pypi.python.org/pypi/snowballstemmer) | 1.2.1 | This package provides 16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms.
219219
[sortedcollections](http://pypi.python.org/pypi/sortedcollections) | 0.4.2 | Python Sorted Collections
220220
[sortedcontainers](http://pypi.python.org/pypi/sortedcontainers) | 1.5.7 | Python Sorted Container Types: SortedList, SortedDict, and SortedSet
221-
[sounddevice](http://pypi.python.org/pypi/sounddevice) | 0.3.6 | Python Sorted Container Types: SortedList, SortedDict, and SortedSet
221+
[sounddevice](http://pypi.python.org/pypi/sounddevice) | 0.3.6 | Play and Record Sound with Python
222222
[sphinx](http://pypi.python.org/pypi/sphinx) | 1.5.1 | Tool for generating documentation which uses reStructuredText as its markup language
223223
[sphinx_rtd_theme](http://pypi.python.org/pypi/sphinx_rtd_theme) | 0.1.9 | ReadTheDocs.org theme for Sphinx, 2013 version.
224224
[spyder](http://pypi.python.org/pypi/spyder) | 3.1.2 | Scientific PYthon Development EnviRonment: designed for interactive computing and data visualisation with a simple and intuitive user interface
@@ -251,4 +251,4 @@ Name | Version | Description
251251
[xlrd](http://pypi.python.org/pypi/xlrd) | 1.0.0 | Extract data from Microsoft Excel spreadsheet files
252252
[xlsxwriter](http://pypi.python.org/pypi/xlsxwriter) | 0.9.5 | A Python module for creating Excel XLSX files.
253253
[zarr](http://pypi.python.org/pypi/zarr) | 2.1.4 | A minimal implementation of chunked, compressed, N-dimensional arrays for Python.
254-
[zict](http://pypi.python.org/pypi/zict) | 0.1.1 | Mutable mapping tools
254+
[zict](http://pypi.python.org/pypi/zict) | 0.1.1 | Mutable mapping tools

‎changelogs/WinPythonQt5-32bit-3.5.3.1.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ Name | Version | Description
223223
[snowballstemmer](https://pypi.python.org/pypi/snowballstemmer) | 1.2.1 | This package provides 16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms.
224224
[sortedcollections](https://pypi.python.org/pypi/sortedcollections) | 0.4.2 | Python Sorted Collections
225225
[sortedcontainers](https://pypi.python.org/pypi/sortedcontainers) | 1.5.7 | Python Sorted Container Types: SortedList, SortedDict, and SortedSet
226-
[sounddevice](https://pypi.python.org/pypi/sounddevice) | 0.3.7 | Python Sorted Container Types: SortedList, SortedDict, and SortedSet
226+
[sounddevice](https://pypi.python.org/pypi/sounddevice) | 0.3.7 | Play and Record Sound with Python
227227
[sphinx](https://pypi.python.org/pypi/sphinx) | 1.5.2 | Tool for generating documentation which uses reStructuredText as its markup language
228228
[sphinx_rtd_theme](https://pypi.python.org/pypi/sphinx_rtd_theme) | 0.2.4 | ReadTheDocs.org theme for Sphinx, 2013 version.
229229
[spyder](https://pypi.python.org/pypi/spyder) | 3.1.4.dev0 | Scientific PYthon Development EnviRonment: designed for interactive computing and data visualisation with a simple and intuitive user interface
@@ -258,4 +258,4 @@ Name | Version | Description
258258
[xlsxwriter](https://pypi.python.org/pypi/xlsxwriter) | 0.9.5 | A Python module for creating Excel XLSX files.
259259
[xlwings](https://pypi.python.org/pypi/xlwings) | 0.10.4 | Interact with Excel from Python and vice versa
260260
[zarr](https://pypi.python.org/pypi/zarr) | 2.1.4 | A minimal implementation of chunked, compressed, N-dimensional arrays for Python.
261-
[zict](https://pypi.python.org/pypi/zict) | 0.1.1 | Mutable mapping tools
261+
[zict](https://pypi.python.org/pypi/zict) | 0.1.1 | Mutable mapping tools

‎changelogs/WinPythonQt5-32bit-3.5.3.1_History.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Upgraded packages:
8888
* [scipy](http://www.scipy.org) 0.18.1 → 0.19.0 (SciPy: Scientific Library for Python (advanced math, signal processing, optimization, statistics, ...))
8989
* [setuptools](https://pypi.python.org/pypi/setuptools) 33.1.1 → 34.3.2 (Download, build, install, upgrade, and uninstall Python packages - easily)
9090
* [sip](https://pypi.python.org/pypi/sip) 4.19 → 4.19.1 (Python extension module generator for C and C++ libraries)
91-
* [sounddevice](https://pypi.python.org/pypi/sounddevice) 0.3.6 → 0.3.7 (Python Sorted Container Types: SortedList, SortedDict, and SortedSet)
91+
* [sounddevice](https://pypi.python.org/pypi/sounddevice) 0.3.6 → 0.3.7 (Play and Record Sound with Python)
9292
* [sphinx](https://pypi.python.org/pypi/sphinx) 1.5.1 → 1.5.2 (Tool for generating documentation which uses reStructuredText as its markup language)
9393
* [sphinx_rtd_theme](https://pypi.python.org/pypi/sphinx_rtd_theme) 0.1.9 → 0.2.4 (ReadTheDocs.org theme for Sphinx, 2013 version.)
9494
* [spyder](https://pypi.python.org/pypi/spyder) 3.1.2 → 3.1.4.dev0 (Scientific PYthon Development EnviRonment: designed for interactive computing and data visualisation with a simple and intuitive user interface)

‎changelogs/WinPythonQt5-32bit-3.6.1.0.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ Name | Version | Description
222222
[snowballstemmer](https://pypi.python.org/pypi/snowballstemmer) | 1.2.1 | This package provides 16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms.
223223
[sortedcollections](https://pypi.python.org/pypi/sortedcollections) | 0.4.2 | Python Sorted Collections
224224
[sortedcontainers](https://pypi.python.org/pypi/sortedcontainers) | 1.5.7 | Python Sorted Container Types: SortedList, SortedDict, and SortedSet
225-
[sounddevice](https://pypi.python.org/pypi/sounddevice) | 0.3.7 | Python Sorted Container Types: SortedList, SortedDict, and SortedSet
225+
[sounddevice](https://pypi.python.org/pypi/sounddevice) | 0.3.7 | Play and Record Sound with Python
226226
[sphinx](https://pypi.python.org/pypi/sphinx) | 1.5.2 | Tool for generating documentation which uses reStructuredText as its markup language
227227
[sphinx_rtd_theme](https://pypi.python.org/pypi/sphinx_rtd_theme) | 0.2.4 | ReadTheDocs.org theme for Sphinx, 2013 version.
228228
[spyder](https://pypi.python.org/pypi/spyder) | 3.1.4.dev0 | Scientific PYthon Development EnviRonment: designed for interactive computing and data visualisation with a simple and intuitive user interface
@@ -256,4 +256,4 @@ Name | Version | Description
256256
[xlsxwriter](https://pypi.python.org/pypi/xlsxwriter) | 0.9.5 | A Python module for creating Excel XLSX files.
257257
[xlwings](https://pypi.python.org/pypi/xlwings) | 0.10.4 | Interact with Excel from Python and vice versa
258258
[zarr](https://pypi.python.org/pypi/zarr) | 2.1.4 | A minimal implementation of chunked, compressed, N-dimensional arrays for Python.
259-
[zict](https://pypi.python.org/pypi/zict) | 0.1.1 | Mutable mapping tools
259+
[zict](https://pypi.python.org/pypi/zict) | 0.1.1 | Mutable mapping tools

0 commit comments

Comments
 (0)