Skip to content

Commit

Permalink
Auto merge of #1013 - micbou:2.7.1, r=puremourning
Browse files Browse the repository at this point in the history
[READY] Increase Python 2 requirement to 2.7.1

See PR ycm-core/YouCompleteMe#2998. The same issue occurs when running the tests on Python 2.7.0.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/valloric/ycmd/1013)
<!-- Reviewable:end -->
  • Loading branch information
zzbot authored Apr 25, 2018
2 parents 5257702 + 27816fa commit 7a4f585
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ tests][test-setup].**

This is all for Ubuntu Linux. Details on getting ycmd running on other OS's can
be found in [YCM's instructions][ycm-install] (ignore the Vim-specific parts).
Note that **ycmd runs on Python 2.7 and 3.4+.**
Note that **ycmd runs on Python 2.7.1+ and 3.4+.**

First, install the minimal dependencies:
```
Expand Down
6 changes: 3 additions & 3 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
import hashlib
import tempfile

PY_MAJOR, PY_MINOR = sys.version_info[ 0 : 2 ]
if not ( ( PY_MAJOR == 2 and PY_MINOR == 7 ) or
PY_MAJOR, PY_MINOR, PY_PATCH = sys.version_info[ 0 : 3 ]
if not ( ( PY_MAJOR == 2 and PY_MINOR == 7 and PY_PATCH >= 1 ) or
( PY_MAJOR == 3 and PY_MINOR >= 4 ) or
PY_MAJOR > 3 ):
sys.exit( 'ycmd requires Python 2.7 or >= 3.4; '
sys.exit( 'ycmd requires Python >= 2.7.1 or >= 3.4; '
'your version of Python is ' + sys.version )

DIR_OF_THIS_SCRIPT = p.dirname( p.abspath( __file__ ) )
Expand Down

0 comments on commit 7a4f585

Please sign in to comment.