Skip to content

Commit 0d1333e

Browse files
committed
Simplify the instructions and scripts
1 parent 4d54c27 commit 0d1333e

File tree

4 files changed

+20
-29
lines changed

4 files changed

+20
-29
lines changed

python/README.md

+14-10
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
1-
# Python module for the plugin
1+
# Python module for the plug-in
22

33
The tests should be kept in the `tests` folder.
44

5-
## Setup instructions for UNIX
5+
## Setup
66

7-
The script `tox-bootstrap.sh` can be used for setting up a testing environment
8-
on Linux and Mac machines.
7+
Install `tox` system wide and just run the `tox` command from the command line.
8+
It should succeed if you have the following:
99

10-
The `tox` tool, when run, creates virtual environments under `.tox/` folder and
11-
their names correspond the names in the `tox.ini` configuration file. For
12-
example, for activating a Python 2.7.x environment one would simply do:
10+
- any version of the Python 2.7 interpreter
11+
12+
Using the python then should be as simple as:
1313

1414
```bash
15-
source .tox/py27/bin/activate
15+
source .tox/${PYTHON_VERSION_LABEL}/bin/activate
1616
```
1717

18-
## Setup instructions for Windows
18+
## Setup instructions for pyenv for UNIX
19+
20+
The script `pyenv-bootstrap.sh` can be used for setting up different versions
21+
of the interpreters on Linux and Mac machines.
1922

20-
TODO
23+
Unfortunately `pyenv` is not supported on Windows, so you will need to install
24+
the interpreters manually.
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
#!/bin/bash
22

33
# Install pyenv by using this: https://github.com/yyuu/pyenv-installer
4-
echo "Installing pyenv"
4+
echo "Installing pyenv for easy setup of interpreters"
55
curl -L https://raw.githubusercontent.com/yyuu/pyenv-installer/master/bin/pyenv-installer | bash
66

7-
. ./tox-env.sh
7+
echo "Do not forget to set the PATH for pyenv to work correctly afterwards!"
8+
9+
export PATH="${HOME}/.pyenv/bin:$PATH"
10+
eval "$(pyenv init -)"
11+
eval "$(pyenv virtualenv-init -)"
812

913
echo "Setting up python interpreters for testing with tox"
1014
echo "WARNING: this will take a long while the first time!"
1115
for v in `cat .python-version`
1216
do
1317
pyenv install $v
1418
done
15-
16-
pyenv virtualenv 3.5.3 ${OMNISHARP_VENV}
17-
pyenv activate ${OMNISHARP_VENV}
18-
pip install --upgrade setuptools pip tox

python/test.sh

-6
This file was deleted.

python/tox-env.sh

-7
This file was deleted.

0 commit comments

Comments
 (0)