Skip to content

Commit

Permalink
Version bump.
Browse files Browse the repository at this point in the history
setup.py will install gevent if stackless is not imported *and* we're using Python2.
It was too difficult to install gevent from source as part of setup.py,
so we just warn instead.
Adjusted tox to reflect the less need for explicit dependencies.
Address #32, which is fallout from #31
  • Loading branch information
rgalanakis committed Jul 25, 2014
1 parent a4b902c commit a9b0a46
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
2 changes: 1 addition & 1 deletion goless/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from .selecting import dcase, rcase, scase, select


version_info = 0, 7, 1
version_info = 0, 7, 2
version = '.'.join([str(v) for v in version_info])

__version__ = version
Expand Down
13 changes: 12 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
from setuptools import setup
import sys
import warnings

from goless import version, __author__, __email__, __url__, __license__

Expand All @@ -8,7 +10,16 @@
# noinspection PyUnresolvedReferences
import stackless
except ImportError:
requires.append('gevent>=1.0')
# See https://github.com/rgalanakis/goless/issues/21
# for why we need this (waiting for new gevent version).
if sys.version_info[0] == 3:
warnings.warn(
'You will need to install gevent from GitHub to use goless with '
'gevent under Python3. Run something like '
'"pip install git+https://github.com/surfly/gevent.git#gevent-egg"'
)
else:
requires.append('gevent>=1.0')

setup(
name='goless',
Expand Down
12 changes: 3 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,23 @@ deps =
mock
nose
setenv =
GOLESS_BACKEND = gevent
GOLESS_BACKEND =

[testenv:26gevent]
basepython = python2.6
deps =
{[testenv]deps}
unittest2
gevent

[testenv:27gevent]
deps =
{[testenv]deps}
gevent

[testenv:pypygevent]
basepython = pypy
deps =
{[testenv]deps}
git+https://github.com/surfly/gevent.git#gevent-egg
setenv =
GOLESS_BACKEND = gevent

; See https://github.com/rgalanakis/goless/issues/21
; for why we need this hackery (waiting for new gevent version).
Expand All @@ -36,8 +34,6 @@ basepython = python3.3
commands =
pip install git+https://github.com/surfly/gevent.git#gevent-egg
nosetests ./tests
setenv =
GOLESS_BACKEND =
deps =
{[testenv]deps}
cython
Expand All @@ -48,8 +44,6 @@ basepython = python3.4
commands =
pip install git+https://github.com/surfly/gevent.git#gevent-egg
nosetests ./tests
setenv =
GOLESS_BACKEND =
deps =
{[testenv]deps}
cython
Expand Down

0 comments on commit a9b0a46

Please sign in to comment.