Merge remote-tracking branch 'upstream/master' into html_link_convert…

…er_slack
skoczen · Nov 25, 2019 · b2081fb · b2081fb
2 parents 10f82a3 + 03e185b
commit b2081fb
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,23 +1,23 @@
 dist: xenial
 language: python
 python:
-  - "2.7"
-  - "3.4"
-  - "3.5"
-  - "3.6"
-  - "3.7"
+  - '2.7'
+  - '3.4'
+  - '3.5'
+  - '3.6'
+  - '3.7'
 sudo: false
 services:
-    - docker
+  - docker
 before_install:
   - sudo apt-get update
   - sudo apt-get install -y libffi-dev libxml2-dev
 install:
-- pip install tox-travis
-- pip install -r will/requirements/dev.txt
+  - pip install tox-travis
+  - pip install -r will/requirements/dev.txt
 script:
-- tox
-- export CTAG="-$TRAVIS_COMMIT"
+  - tox
+  - export CTAG="-$TRAVIS_COMMIT"
 # - "fab docker_build"
 # deploy:
 #   skip_cleanup: true

diff --git a/AUTHORS b/AUTHORS
@@ -55,3 +55,4 @@ Ahmed Osman, https://github.com/Ashex
 Boris Peterbarg, https://github.com/reist
 unicolet, https://github.com/unicolet
 Rob Salmond, https://github.com/rsalmond
+Jeremy Logan, https://github.com/fixedd
diff --git a/docs/img/hangout.gif b/docs/img/hangout.gif
diff --git a/docs/plugins/bundled.md b/docs/plugins/bundled.md
@@ -181,12 +181,6 @@ If you want to shorten long URL using Bitly API, Will can do that for you in a f
 
 ![Bitly](../img/bitly.png)
 
-#### Hangout
-
-If you've set a `HANGOUT_URL`, will will toss it in chat for you:
-
-![Hangout](../img/hangout.gif)
-
 #### Image me
 
 Sometimes, a picture is worth a thousand words.

diff --git a/docs/plugins/notice.md b/docs/plugins/notice.md
@@ -68,7 +68,7 @@ It's one of the best things about robots - they never, ever forget.  Will's no e
 ```python
 @periodic(hour='10', minute='0', day_of_week="mon-fri")
 def standup(self):
-    self.say("@all Standup! %s" % settings.WILL_HANGOUT_URL)
+    self.say("@all Standup! %s" % settings.STANDUP_URL)
 ```
 
 Under the hood, `@periodic` uses [apscheduler](https://apscheduler.readthedocs.io/en/v2.1.2/cronschedule.html#available-fields) to provide its options, so you can use any of the following as keyword arguments:

diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@
 
 
 tests_require = [
-    'pytest',
+    'pytest==4.6.6',
     'pytest-cov',
     'pytest-runner',
     'mock'

diff --git a/will/plugins/productivity/hangout.py b/will/plugins/productivity/hangout.py
diff --git a/will/requirements/base.txt b/will/requirements/base.txt
@@ -24,5 +24,5 @@ regex==2017.9.23
 redis==2.10.6
 requests==2.20.0
 six==1.10.0
-urllib3==1.24.2
+urllib3==1.24.3
 websocket-client==0.44.0
diff --git a/will/requirements/dev.txt b/will/requirements/dev.txt
@@ -10,5 +10,5 @@ nose
 coverage
 yappi
 tox
-pytest
+pytest==4.6.6
 pytest-cov
diff --git a/will/requirements/slack.txt b/will/requirements/slack.txt
@@ -1,4 +1,4 @@
 -r base.txt
-slackclient>=1.2.1<1.3.0
+slackclient>=1.2.1,<1.3.0
 markdownify==0.4.1
 
diff --git a/will/scripts/config.py.dist b/will/scripts/config.py.dist
@@ -61,7 +61,6 @@ PLUGINS = [
 
 # Don't load any of the plugins in this list.  Same options as above.
 PLUGIN_BLACKLIST = [
-    "will.plugins.productivity.hangout",   # Because it requires a HANGOUT_URL
     "will.plugins.productivity.bitly",   # Because it requires a BITLY_ACCESS_TOKEN key and the bitly_api library
     "will.plugins.devops.bitbucket_is_up",   # Because most folks use github.
     "will.plugins.devops.pagerduty",  # Because it requires a PAGERDUTY_SUBDOMAIN and PAGERDUTY_API_KEY key