summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Magnusson <ulfalizer@gmail.com>2019-10-05 21:14:24 +0200
committerUlf Magnusson <ulfalizer@gmail.com>2019-10-05 22:06:43 +0200
commit21b4c1e3b6e2867b9a0788d21a358f6b1f581d86 (patch)
treed34aac6dae345a641d80de46bc962088d5b07b8e
parentbc6345d7fee1a7200bef5d717d1b2d00264d9e01 (diff)
Do not automatically install windows-curses on Windows
It breaks installation with pip on MSYS2, and Kconfiglib can still be useful without the terminal menuconfig. Unfortunately, MSYS2 seems tricky to identify via environment markers (https://www.python.org/dev/peps/pep-0508/#environment-markers). This has breakage/annoyance potential, as windows-curses now needs to be installed manually. The major Kconfiglib version will be increased. Sorry if this change caused problems! Fixes: #77
-rw-r--r--README.rst10
-rwxr-xr-xmenuconfig.py9
-rw-r--r--setup.py8
3 files changed, 10 insertions, 17 deletions
diff --git a/README.rst b/README.rst
index 4b23897..4ae4e46 100644
--- a/README.rst
+++ b/README.rst
@@ -126,9 +126,9 @@ Manual installation
~~~~~~~~~~~~~~~~~~~
Just drop ``kconfiglib.py`` and the scripts you want somewhere. There are no
-third-party dependencies (except for the `windows-curses
-<https://github.com/zephyrproject-rtos/windows-curses>`_ package on Windows,
-when running the terminal ``menuconfig`` implementation).
+third-party dependencies, but the terminal ``menuconfig`` won't work on Windows
+unless a package like `windows-curses
+<https://github.com/zephyrproject-rtos/windows-curses>`_ is installed.
Installation for the Linux kernel
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -507,9 +507,7 @@ Three configuration interfaces are currently available:
There are no third-party dependencies on \*nix. On Windows,
the ``curses`` modules is not available by default, but support
- can be added by installing the ``windows-curses`` package (which is
- installed automatically when Kconfiglib is installed via ``pip``
- on Windows):
+ can be added by installing the ``windows-curses`` package:
.. code-block:: shell
diff --git a/menuconfig.py b/menuconfig.py
index 4815c7f..58175c3 100755
--- a/menuconfig.py
+++ b/menuconfig.py
@@ -174,12 +174,11 @@ Other features
Limitations
===========
-Doesn't work out of the box on Windows, but can be made to work with 'pip
-install windows-curses'. See the
-https://github.com/zephyrproject-rtos/windows-curses repository.
+Doesn't work out of the box on Windows, but can be made to work with
-'pip install kconfiglib' on Windows automatically installs windows-curses
-to make the menuconfig usable.
+ pip install windows-curses
+
+See the https://github.com/zephyrproject-rtos/windows-curses repository.
"""
from __future__ import print_function
diff --git a/setup.py b/setup.py
index 7e9ede4..e5dbbb9 100644
--- a/setup.py
+++ b/setup.py
@@ -61,12 +61,8 @@ setuptools.setup(
)
},
- # The terminal menuconfig implementation uses the standard Python 'curses'
- # module. The windows-curses package makes it available on Windows. See
- # https://github.com/zephyrproject-rtos/windows-curses.
- install_requires=(
- 'windows-curses; sys_platform == "win32"',
- ),
+ # Note: windows-curses is not automatically installed on Windows anymore,
+ # because it made Kconfiglib impossible to install on MSYS2 with pip
# Needs support for unnumbered {} in format() and argparse
python_requires=">=2.7,!=3.0.*,!=3.1.*",