Commit 5d0bc38
denfromufa
Merge pull request pythonnet#7 from denfromufa/master
update with fixes for tox3 files changed
Lines changed: 15 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -58,8 +58,8 @@ install: | |||
| 58 | 58 | - pip install tox-travis | |
| 59 | 59 | - pip install six | |
| 60 | 60 | - pip install pycparser | |
| 61 | - - python setup.py build_ext --inplace | ||
| 62 | - script: | ||
| 63 | 61 | - tox | |
| 62 | + - python setup.py build_ext --inplace | ||
| 63 | + script: | ||
| 64 | 64 | - export PYTHONPATH=`pwd`:$PYTHONPATH | |
| 65 | 65 | - python src/tests/runtests.py | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -229,6 +229,10 @@ def _install_packages(self): | |||
| 229 | 229 | nuget = "mono %s" % nuget | |
| 230 | 230 | use_shell = True | |
| 231 | 231 | ||
| 232 | + cmd = "%s update -self" % nuget | ||
| 233 | + self.announce("Updating NuGet: %s" % cmd) | ||
| 234 | + check_call(cmd, shell=use_shell) | ||
| 235 | + | ||
| 232 | 236 | cmd = "%s restore pythonnet.sln -o packages" % nuget | |
| 233 | 237 | self.announce("Installing packages: %s" % cmd) | |
| 234 | 238 | check_call(cmd, shell=use_shell) | |
@@ -323,7 +327,7 @@ def _get_interop_filename(): | |||
| 323 | 327 | ||
| 324 | 328 | setup( | |
| 325 | 329 | name="pythonnet", | |
| 326 | - version="2.1.0", | ||
| 330 | + version="2.2.0-dev1", | ||
| 327 | 331 | description=".Net and Mono integration for Python", | |
| 328 | 332 | url='http://pythonnet.github.io/', | |
| 329 | 333 | author="Python for .Net developers", | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,8 @@ | |||
| 1 | + # content of: tox.ini , put in same dir as setup.py | ||
| 2 | + [tox] | ||
| 3 | + envlist = py27,py33,py34,py35 | ||
| 4 | + [tox:travis] | ||
| 5 | + 2.7 = py27 | ||
| 6 | + 3.3 = py33 | ||
| 7 | + 3.4 = py34 | ||
| 8 | + 3.5 = py35 | ||
0 commit comments