Skip to content

Commit

Permalink
Merge c76c76a into 607de80
Browse files Browse the repository at this point in the history
  • Loading branch information
tacaswell committed Oct 30, 2019
2 parents 607de80 + c76c76a commit ea0dc32
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 15 deletions.
27 changes: 22 additions & 5 deletions .travis.yml
@@ -1,9 +1,26 @@
language: python
python: 2.7
env:
- TOX_ENV=py27
- TOX_ENV=pep8
- TOX_ENV=py34
dist: xenial

matrix:
include:
- python: 3.8
env:
- TOX_ENV=pep8
- python: 3.4
env:
- TOX_ENV=py34
- python: 3.5
env:
- TOX_ENV=py35
- python: 3.6
env:
- TOX_ENV=py36
- python: 3.7
env:
- TOX_ENV=py37
- python: 3.8
env:
- TOX_ENV=py38
install:
- pip install tox coveralls
script:
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Expand Up @@ -21,8 +21,8 @@ def read(fname):
install_requires=[
'six',
'contexter',
'weakrefmethod',
],
python_requires='>=3.4',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
Expand All @@ -34,4 +34,3 @@ def read(fname):
'Topic :: Software Development :: Libraries :: Python Modules',
],
)

8 changes: 1 addition & 7 deletions signalslot/slot.py
Expand Up @@ -4,15 +4,9 @@

import types
import weakref
import sys

from .signal import BaseSlot

# We cannot test a branch for Python >= 3.4 in Python < 3.4.
if sys.version_info < (3, 4): # pragma: no cover
from weakrefmethod import WeakMethod
else: # pragma: no cover
from weakref import WeakMethod
from weakref import WeakMethod


class Slot(BaseSlot):
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist = py27,pep8,py34
envlist = pep8,py34,py35,py36,py37,py38

[testenv]
commands = py.test --doctest-modules signalslot
Expand Down

0 comments on commit ea0dc32

Please sign in to comment.