From 524b4f4ac9d71ce91963b5457c85b5b7f7403f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20Andr=C3=A9s=20Margffoy=20Tuay?= Date: Thu, 31 May 2018 15:38:23 -0500 Subject: [PATCH 1/5] Remove pexpect from windows requirements --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 0086ce11..a1978d9b 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ def get_description(): return data -REQUIREMENTS = ['spyder>=3.2.0', 'pexpect', 'tornado', +REQUIREMENTS = ['spyder>=3.2.0', 'tornado', 'coloredlogs', 'requests'] @@ -55,7 +55,8 @@ def get_description(): # Add pywinpty to our Windows dependencies when building wheels if os.name == 'nt' or any([arg.startswith('win') for arg in sys.argv]): REQUIREMENTS.append('pywinpty>=0.2.1') - +else: + REQUIREMENTS.append('pexpect') cmdclass = { 'build_static': BuildStatic, From 6a2216c2ef4cfc94127c6ed33522081fa26b07c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20Andr=C3=A9s=20Margffoy=20Tuay?= Date: Thu, 31 May 2018 15:47:31 -0500 Subject: [PATCH 2/5] Remove pexpect references from README --- README.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 41bade65..15a86f2a 100644 --- a/README.rst +++ b/README.rst @@ -97,9 +97,8 @@ This project depends on 1. `Spyder `_ 2. `Tornado `_ -3. `Pexpect `_ -4. `Coloredlogs `_ -5. `xterm.js `_ +3. `Coloredlogs `_ +4. `xterm.js `_ We provide Windows support thanks to the `Pywinpty `_ Python bindings for @@ -170,4 +169,3 @@ Become a sponsor to get your logo on our README on Github. .. image:: https://opencollective.com/spyder/sponsors.svg :target: https://opencollective.com/spyder#support :alt: Sponsors - From df05a043ada1ce04691ec3b943010532b5ec3edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20Andr=C3=A9s=20Margffoy=20Tuay?= Date: Thu, 31 May 2018 15:54:34 -0500 Subject: [PATCH 3/5] Add pywinpty to requirements list on README --- README.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 15a86f2a..7973bc02 100644 --- a/README.rst +++ b/README.rst @@ -97,8 +97,10 @@ This project depends on 1. `Spyder `_ 2. `Tornado `_ -3. `Coloredlogs `_ -4. `xterm.js `_ +3. `Pexpect `_ (*nix Systems) +4. `pywinpty ` (Windows Systems) +4. `Coloredlogs `_ +5. `xterm.js `_ We provide Windows support thanks to the `Pywinpty `_ Python bindings for From a6dc31351ae19d210f131712158ae08d6c46960d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20Andr=C3=A9s=20Margffoy=20Tuay?= Date: Thu, 31 May 2018 15:55:41 -0500 Subject: [PATCH 4/5] Remove pexpect from Appveyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b0d14afb..12a4d29d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ environment: PIP_DEPENDENCIES_FLAGS: "-q" CONDA_DEPENDENCIES_FLAGS: "--quiet" CONDA_DEPENDENCIES: > - spyder pytest pytest-cov flaky tornado pexpect coloredlogs pywinpty + spyder pytest pytest-cov flaky tornado coloredlogs pywinpty PIP_DEPENDENCIES: "pytest-qt" APPVEYOR_RDP_PASSWORD: "dcca4c4863E30d56c2e0dda6327370b3#" From 4eb6d69ac0ca6dc3d3f2b3b15186fe7679dc42b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20Andr=C3=A9s=20Margffoy=20Tuay?= Date: Thu, 31 May 2018 16:08:56 -0500 Subject: [PATCH 5/5] Minor typo correction on README --- README.rst | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 7973bc02..460ff430 100644 --- a/README.rst +++ b/README.rst @@ -98,13 +98,10 @@ This project depends on 1. `Spyder `_ 2. `Tornado `_ 3. `Pexpect `_ (*nix Systems) -4. `pywinpty ` (Windows Systems) +4. `pywinpty `_ (Windows Systems) 4. `Coloredlogs `_ 5. `xterm.js `_ -We provide Windows support thanks to the -`Pywinpty `_ Python bindings for -the awesome `Winpty `_ library. Changelog ---------