Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Remove pexpect from windows requirements #139

Merged
merged 5 commits into from
May 31, 2018
Merged

PR: Remove pexpect from windows requirements #139

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
524b4f4
Remove pexpect from windows requirements
andfoy May 31, 2018
6a2216c
Remove pexpect references from README
andfoy May 31, 2018
df05a04
Add pywinpty to requirements list on README
andfoy May 31, 2018
a6dc313
Remove pexpect from Appveyor
andfoy May 31, 2018
4eb6d69
Minor typo correction on README
andfoy May 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ This project depends on

1. `Spyder <https://github.com/spyder-ide/spyder>`_
2. `Tornado <https://github.com/tornadoweb/tornado>`_
3. `Pexpect <https://github.com/pexpect/pexpect>`_
3. `Pexpect <https://github.com/pexpect/pexpect>`_ (*nix Systems)
4. `pywinpty <https://github.com/spyder-ide/pywinpty>` (Windows Systems)
Copy link
Member

@ccordoba12 ccordoba12 May 31, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a missing _ at the end ;-p:

..spyder-ide/pywinpty>_`

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems my last comment was not registered correctly: please add a missing _ at the end here, i.e.

pywinpty <https://github.com/spyder-ide/pywinpty>`_ (Windows Systems)

4. `Coloredlogs <https://github.com/xolox/python-coloredlogs>`_
5. `xterm.js <https://github.com/sourcelair/xterm.js>`_

Expand Down Expand Up @@ -170,4 +171,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

5 changes: 3 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def get_description():
return data


REQUIREMENTS = ['spyder>=3.2.0', 'pexpect', 'tornado',
REQUIREMENTS = ['spyder>=3.2.0', 'tornado',
'coloredlogs', 'requests']


Expand All @@ -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,
Expand Down