From 7577567e7fc94cfa6020d8a75193e4cc15e70fb8 Mon Sep 17 00:00:00 2001 From: stonebig Date: Thu, 14 Jan 2016 19:54:39 +0100 Subject: [PATCH 1/8] readme better --- README => README.rst | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README => README.rst (100%) diff --git a/README b/README.rst similarity index 100% rename from README rename to README.rst From d788ffb2793d32acbad33516153129322f91dff9 Mon Sep 17 00:00:00 2001 From: stonebig Date: Thu, 14 Jan 2016 20:04:05 +0100 Subject: [PATCH 2/8] readme better2 --- README.rst | 101 ++++++++++++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 47 deletions(-) diff --git a/README.rst b/README.rst index bf76c0df..617094ff 100644 --- a/README.rst +++ b/README.rst @@ -6,60 +6,67 @@ Licensed under the terms of the MIT License (see winpython/__init__.py for details) - Overview +Overview +-------- - WinPython is a portable distribution of the Python programming - language for Windows (http://winpython.github.io). +WinPython is a portable distribution of the Python programming +language for Windows (http://winpython.github.io). - This is the `winpython` Python package, not the distribution itself. - It includes two main features: +This is the `winpython` Python package, not the distribution itself. +It includes two main features: - The WinPython Package Manager (WPPM): let you install/uninstall - to your WinPython distribution any standard Python package built - with distutils (e.g. "dummypackage-2.1.win-amd64-py3.4.‌exe") - or with wheels (e.g. "dummypackage-2.1-py2.py3-none-any.whl") + The WinPython Package Manager (WPPM): let you install/uninstall + to your WinPython distribution any standard Python package built + with distutils (e.g. "dummypackage-2.1.win-amd64-py3.4.‌exe") + or with wheels (e.g. "dummypackage-2.1-py2.py3-none-any.whl") - The WinPython build toolchain: make.py is the script used to - build a WinPython distribution from (almost) scratch. + The WinPython build toolchain: make.py is the script used to + build a WinPython distribution from (almost) scratch. - Dependencies - - Python2 >= 2.7 or Python3 >= 3.4 - PyQt4 >= 4.11 or PyQt5 >= 5.4 (PyQt4 is recommended) - pip >= 7.1.0 and setuptools >= 17.1.1 +Dependencies +------------ + +* Python2 >= 2.7 or Python3 >= 3.4 + +* PyQt4 >= 4.11 or PyQt5 >= 5.4 (PyQt4 is recommended) - Requirements +* pip >= 7.1.0 and setuptools >= 17.1.1 - 7zip (directory has to be available in PATH) - NSIS: - * "Large strings" special build (http://nsis.sourceforge.net/Special_Builds) - * with TextReplace plugin installed +Requirements +------------ - Installation +* 7zip (directory has to be available in PATH) + +* NSIS: + * "Large strings" special build (http://nsis.sourceforge.net/Special_Builds) + * with TextReplace plugin installed + +Installation +------------ - From the source package (see section 'Building dependencies'), you may - install WinPython using the integrated setup.py script based on Python - standard library `distutils` with the following command: - `python setup.py install` - - Note that `distutils` does *not* uninstall previous versions of Python - packages: it simply copies files on top of an existing installation. - When using this command, it is thus highly recommended to uninstall - manually any previous version of WinPython by removing the associated - directory ('winpython' in your site-packages directory). - - From the Python package index, you may simply install WinPython *and* - upgrade an existing installation using `pip`: - http://pypi.python.org/pypi - - But the easiest way to install the last stable release of WinPython is - by using an executable installer: http://winpython.github.io/ +From the source package (see section 'Building dependencies'), you may +install WinPython using the integrated setup.py script based on Python +standard library `distutils` with the following command:: + python setup.py install + +Note that `distutils` does *not* uninstall previous versions of Python +packages: it simply copies files on top of an existing installation. +When using this command, it is thus highly recommended to uninstall +manually any previous version of WinPython by removing the associated +directory ('winpython' in your site-packages directory). + +From the Python package index, you may simply install WinPython *and* +upgrade an existing installation using `pip`:: + http://pypi.python.org/pypi + +But the easiest way to install the last stable release of WinPython is +by using an executable installer: http://winpython.github.io/ - More informations - - Downloads: - https://sourceforge.net/projects/winpython/files/ - Development, bug reports and feature requests: - https://github.com/winpython/winpython - Discussions: - http://groups.google.com/group/winpython +More informations +----------------- + +* Downloads: https://sourceforge.net/projects/winpython/files/ + +* Development, bug reports and feature requests: https://github.com/winpython/winpython + +* Discussions: http://groups.google.com/group/winpython From 23e8b6b80da17bdccff5d3f5f46283948cbff8f2 Mon Sep 17 00:00:00 2001 From: stonebig Date: Thu, 14 Jan 2016 20:09:27 +0100 Subject: [PATCH 3/8] readme better3 --- README.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index 617094ff..b9a80040 100644 --- a/README.rst +++ b/README.rst @@ -15,13 +15,13 @@ language for Windows (http://winpython.github.io). This is the `winpython` Python package, not the distribution itself. It includes two main features: - The WinPython Package Manager (WPPM): let you install/uninstall - to your WinPython distribution any standard Python package built - with distutils (e.g. "dummypackage-2.1.win-amd64-py3.4.‌exe") - or with wheels (e.g. "dummypackage-2.1-py2.py3-none-any.whl") +* The WinPython Package Manager (WPPM): let you install/uninstall +to your WinPython distribution any standard Python package built +with distutils (e.g. "dummypackage-2.1.win-amd64-py3.4.‌exe") +or with wheels (e.g. "dummypackage-2.1-py2.py3-none-any.whl") - The WinPython build toolchain: make.py is the script used to - build a WinPython distribution from (almost) scratch. +* The WinPython build toolchain: make.py is the script used to +build a WinPython distribution from (almost) scratch. Dependencies ------------ From 1e73988bcac50197b80b74502589c79155347f93 Mon Sep 17 00:00:00 2001 From: stonebig Date: Thu, 14 Jan 2016 20:14:32 +0100 Subject: [PATCH 4/8] readme better4 --- README.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index b9a80040..5c44c2fd 100644 --- a/README.rst +++ b/README.rst @@ -16,12 +16,12 @@ This is the `winpython` Python package, not the distribution itself. It includes two main features: * The WinPython Package Manager (WPPM): let you install/uninstall -to your WinPython distribution any standard Python package built -with distutils (e.g. "dummypackage-2.1.win-amd64-py3.4.‌exe") -or with wheels (e.g. "dummypackage-2.1-py2.py3-none-any.whl") + to your WinPython distribution any standard Python package built + with distutils (e.g. "dummypackage-2.1.win-amd64-py3.4.‌exe") + or with wheels (e.g. "dummypackage-2.1-py2.py3-none-any.whl") * The WinPython build toolchain: make.py is the script used to -build a WinPython distribution from (almost) scratch. + build a WinPython distribution from (almost) scratch. Dependencies ------------ From 81e6c246ada71396b147a2058851ea5949415e92 Mon Sep 17 00:00:00 2001 From: stonebig Date: Thu, 14 Jan 2016 20:23:41 +0100 Subject: [PATCH 5/8] readme better 5 --- LICENSE | 2 +- README.rst | 3 +++ winpython/__init__.py | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 2d19cc92..33f261e5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ Copyright (c) 2012-2014 Pierre Raybaut - Copyright (c) 2014-2015 The Winpython development team https://github.com/winpython/ + Copyright (c) 2014-2016 The Winpython development team https://github.com/winpython/ 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: diff --git a/README.rst b/README.rst index 5c44c2fd..688263f5 100644 --- a/README.rst +++ b/README.rst @@ -2,6 +2,9 @@ WinPython tools =============== Copyright © 2012-2013 Pierre Raybaut + +Copyright © 2014-2016 The Winpython development team https://github.com/winpython/ + Licensed under the terms of the MIT License (see winpython/__init__.py for details) diff --git a/winpython/__init__.py b/winpython/__init__.py index 412ec3ae..ee61f227 100644 --- a/winpython/__init__.py +++ b/winpython/__init__.py @@ -4,6 +4,7 @@ ----------------------------------------- Copyright (c) 2012-2013 Pierre Raybaut +Copyright (c) 2014-2016 The Winpython development team https://github.com/winpython/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation From 3ed55d66bc2a525605e7733775126a613364254c Mon Sep 17 00:00:00 2001 From: stonebig Date: Thu, 14 Jan 2016 20:27:32 +0100 Subject: [PATCH 6/8] readme 6 --- README.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 688263f5..402efb76 100644 --- a/README.rst +++ b/README.rst @@ -18,12 +18,14 @@ language for Windows (http://winpython.github.io). This is the `winpython` Python package, not the distribution itself. It includes two main features: -* The WinPython Package Manager (WPPM): let you install/uninstall +:The WinPython Package Manager (WPPM): + let you install/uninstall to your WinPython distribution any standard Python package built with distutils (e.g. "dummypackage-2.1.win-amd64-py3.4.‌exe") or with wheels (e.g. "dummypackage-2.1-py2.py3-none-any.whl") -* The WinPython build toolchain: make.py is the script used to +:The WinPython build toolchain: + make.py is the script used to build a WinPython distribution from (almost) scratch. Dependencies From b9c28556b082fd514a3fecb6cfca4ce4458a6548 Mon Sep 17 00:00:00 2001 From: stonebig Date: Thu, 14 Jan 2016 20:29:52 +0100 Subject: [PATCH 7/8] readme 7 --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 402efb76..0e5a7191 100644 --- a/README.rst +++ b/README.rst @@ -18,13 +18,13 @@ language for Windows (http://winpython.github.io). This is the `winpython` Python package, not the distribution itself. It includes two main features: -:The WinPython Package Manager (WPPM): +:WinPython Package Manager (WPPM) let you install/uninstall to your WinPython distribution any standard Python package built with distutils (e.g. "dummypackage-2.1.win-amd64-py3.4.‌exe") or with wheels (e.g. "dummypackage-2.1-py2.py3-none-any.whl") -:The WinPython build toolchain: +:WinPython build toolchain make.py is the script used to build a WinPython distribution from (almost) scratch. From 34f970788d3d1d0b9f9780258880f5ba5580d95f Mon Sep 17 00:00:00 2001 From: stonebig Date: Thu, 14 Jan 2016 20:31:26 +0100 Subject: [PATCH 8/8] readme 8 --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 0e5a7191..da038589 100644 --- a/README.rst +++ b/README.rst @@ -18,13 +18,13 @@ language for Windows (http://winpython.github.io). This is the `winpython` Python package, not the distribution itself. It includes two main features: -:WinPython Package Manager (WPPM) +WinPython Package Manager (WPPM) let you install/uninstall to your WinPython distribution any standard Python package built with distutils (e.g. "dummypackage-2.1.win-amd64-py3.4.‌exe") or with wheels (e.g. "dummypackage-2.1-py2.py3-none-any.whl") -:WinPython build toolchain +WinPython build toolchain make.py is the script used to build a WinPython distribution from (almost) scratch.