travis failed on master / not running

[belm0]

• CI doesn't appear to be running for my last two PR's (make supports custom python interpreter #83, Python 35 #84 )
• travis build looks failed on master
• build badge in README is not pointing to master

[belm0]

https://travis-ci.org/HyperionGray/trio-websocket/jobs/453122094

$ make test
pytest --cov=trio_websocket
Traceback (most recent call last):
  File "/home/travis/virtualenv/python3.6.3/lib/python3.6/site-packages/pluggy/__init__.py", line 397, in load_setuptools_entrypoints
    plugin = ep.load()
  File "/home/travis/virtualenv/python3.6.3/lib/python3.6/site-packages/pkg_resources/__init__.py", line 2404, in load
    self.require(*args, **kwargs)
  File "/home/travis/virtualenv/python3.6.3/lib/python3.6/site-packages/pkg_resources/__init__.py", line 2427, in require
    items = working_set.resolve(reqs, env, installer, extras=self.extras)
  File "/home/travis/virtualenv/python3.6.3/lib/python3.6/site-packages/pkg_resources/__init__.py", line 875, in resolve
    raise VersionConflict(dist, req).with_context(dependent_req)
pkg_resources.VersionConflict: (pytest 3.3.0 (/home/travis/virtualenv/python3.6.3/lib/python3.6/site-packages), Requirement.parse('pytest>=3.6'))

I have no idea why travis isn't running on those two PR's.

[belm0]

build and build badge are fixed

still no idea why travis is not running on some PR's

[mehaase]

I think it didn't build because I changed Travis settings. I had both the "branch" and "PR" triggers turned on, but it was building twice for each PR, so I turned off the PR trigger. But I guess the branch trigger doesn't apply to external repos...

I've turned the PR trigger back on just now.

[belm0]

thank you