Scheduled weekly dependency update for week 32 (#2074)

Scheduled weekly dependency update for week 32
HypothesisWorks · Aug 13, 2019 · 000387f · 000387f
2 parents 8269d65 + 4642575
commit 000387f
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 61 deletions.
diff --git a/.pyup.yml b/.pyup.yml
@@ -10,3 +10,4 @@ requirements:
       pin: True
 
 schedule: "every week on monday"
+search: False
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -7,7 +7,7 @@
 apipkg==1.5               # via execnet
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0
-execnet==1.6.1            # via pytest-xdist
+execnet==1.7.0            # via pytest-xdist
 importlib-metadata==0.19  # via pluggy, pytest
 more-itertools==7.2.0     # via pytest
 packaging==19.1           # via pytest
@@ -17,6 +17,6 @@ pyparsing==2.4.2          # via packaging
 pytest-forked==1.0.2      # via pytest-xdist
 pytest-xdist==1.29.0
 pytest==5.0.1
-six==1.12.0               # via more-itertools, packaging, pytest-xdist
+six==1.12.0               # via packaging, pytest-xdist
 wcwidth==0.1.7            # via pytest
 zipp==0.5.2               # via importlib-metadata
diff --git a/requirements/tools.txt b/requirements/tools.txt
@@ -9,7 +9,7 @@ appdirs==1.4.3            # via black
 astroid==2.2.5            # via pylint
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0
-autoflake==1.3
+autoflake==1.3.1
 babel==2.7.0              # via sphinx
 backcall==0.1.0           # via ipython
 bandit==1.6.2
@@ -19,8 +19,9 @@ certifi==2019.6.16        # via requests
 chardet==3.0.4            # via requests
 click==7.0                # via black, pip-tools, pyupio, safety
 coverage==4.5.4
+ddt==1.2.1                # via gitpython
 decorator==4.4.0          # via ipython, traitlets
-deprecated==1.2.5         # via pygithub
+deprecated==1.2.6         # via pygithub
 django==2.2.4
 docutils==0.15.2          # via readme-renderer, restructuredtext-lint, sphinx
 dparse==0.4.1             # via pyupio, safety
@@ -32,14 +33,15 @@ flake8-docstrings==1.3.1
 flake8-polyfill==1.0.2    # via flake8-docstrings
 flake8==3.7.8
 gitdb2==2.0.5             # via gitpython
-gitpython==2.1.13         # via bandit
+gitdb==0.6.4              # via gitpython
+gitpython==3.0.0          # via bandit
 idna==2.8                 # via requests
 imagesize==1.1.0          # via sphinx
 importlib-metadata==0.19  # via pluggy, pytest, tox
 ipython-genutils==0.2.0   # via traitlets
 ipython==7.7.0
 isort==4.3.21
-jedi==0.14.1              # via ipython
+jedi==0.15.1              # via ipython
 jinja2==2.10.1            # via pyupio, sphinx
 lark-parser==0.7.2
 lazy-object-proxy==1.4.1  # via astroid
@@ -72,16 +74,17 @@ pytest==5.0.1
 python-dateutil==2.8.0
 python-gitlab==1.10.0     # via pyupio
 pytz==2019.2              # via babel, django
-pyupgrade==1.19.0
+pyupgrade==1.22.1
 pyupio==1.0.2
 pyyaml==5.1.2             # via bandit, dparse, pyupio
 readme-renderer==24.0     # via twine
 requests-toolbelt==0.9.1  # via twine
 requests==2.22.0
 restructuredtext-lint==1.3.0
 safety==1.8.5             # via pyupio
-six==1.12.0               # via astroid, bandit, bleach, dparse, packaging, pip-tools, prompt-toolkit, pydocstyle, python-dateutil, python-gitlab, pyupio, readme-renderer, stevedore, tox, traitlets
+six==1.12.0               # via astroid, bandit, bleach, dparse, packaging, pip-tools, prompt-toolkit, python-dateutil, python-gitlab, pyupio, readme-renderer, stevedore, tox, traitlets
 smmap2==2.0.5             # via gitdb2
+smmap==0.9.0              # via gitdb
 snowballstemmer==1.9.0    # via pydocstyle, sphinx
 sphinx-rtd-theme==0.4.3
 sphinx==2.1.2
@@ -93,13 +96,14 @@ sphinxcontrib-qthelp==1.0.2  # via sphinx
 sphinxcontrib-serializinghtml==1.1.3  # via sphinx
 sqlparse==0.3.0           # via django
 stevedore==1.30.1         # via bandit
-tokenize-rt==3.0.1        # via pyupgrade
+tokenize-rt==3.2.0        # via pyupgrade
 toml==0.10.0
 tox==3.13.2
-tqdm==4.32.2              # via pyupio, twine
+tqdm==4.33.0              # via pyupio, twine
 traitlets==4.3.2          # via ipython
 twine==1.13.0
 typed-ast==1.4.0          # via astroid, mypy
+typing-extensions==3.7.4  # via mypy
 urllib3==1.25.3           # via requests
 virtualenv==16.7.2        # via tox
 wcwidth==0.1.7            # via prompt-toolkit, pytest
@@ -108,4 +112,4 @@ wrapt==1.11.2             # via astroid, deprecated
 zipp==0.5.2               # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.0.1      # via ipython, safety, sphinx, twine
+# setuptools==41.0.1        # via ipython, safety, sphinx, twine
diff --git a/tooling/src/hypothesistooling/__init__.py b/tooling/src/hypothesistooling/__init__.py
@@ -71,21 +71,17 @@ def point_of_divergence():
 
 
 def has_changes(files):
-    return (
-        subprocess.call(
-            [
-                "git",
-                "diff",
-                "--no-patch",
-                "--exit-code",
-                point_of_divergence(),
-                "HEAD",
-                "--",
-                *files,
-            ]
-        )
-        != 0
-    )
+    command = [
+        "git",
+        "diff",
+        "--no-patch",
+        "--exit-code",
+        point_of_divergence(),
+        "HEAD",
+        "--",
+        *files,
+    ]
+    return subprocess.call(command) != 0
 
 
 def has_uncommitted_changes(filename):
@@ -105,8 +101,11 @@ def git(*args):
     subprocess.check_call(("git",) + args)
 
 
+TOOLING_COMMITER_NAME = "Travis CI on behalf of David R. MacIver"
+
+
 def configure_git():
-    git("config", "user.name", "Travis CI on behalf of David R. MacIver")
+    git("config", "user.name", TOOLING_COMMITER_NAME)
     git("config", "user.email", "david@drmaciver.com")
     git("config", "core.sshCommand", "ssh -i deploy_key")
     git("remote", "add", "ssh-origin", "git@github.com:HypothesisWorks/hypothesis.git")
@@ -140,34 +139,6 @@ def has_travis_secrets():
     return os.environ.get("TRAVIS_SECURE_ENV_VARS", None) == "true"
 
 
-def build_jobs():
-    """Query the Travis API to find out what the state of the other build jobs
-    is.
-
-    Note: This usage of Travis has been somewhat reverse engineered due
-    to a certain dearth of documentation as to what values what takes
-    when.
-    """
-    import requests
-
-    build_id = os.environ["TRAVIS_BUILD_ID"]
-
-    url = "https://api.travis-ci.org/builds/%s" % (build_id,)
-    data = requests.get(
-        url, headers={"Accept": "application/vnd.travis-ci.2+json"}
-    ).json()
-
-    matrix = data["jobs"]
-
-    jobs = {}
-
-    for m in matrix:
-        name = m["config"]["env"].replace("TASK=", "")
-        status = m["state"]
-        jobs.setdefault(status, []).append(name)
-    return jobs
-
-
 def modified_files():
     files = set()
     for command in [

diff --git a/tooling/src/hypothesistooling/__main__.py b/tooling/src/hypothesistooling/__main__.py
@@ -330,9 +330,8 @@ def push_pyup_requirements_commit():
 @task()
 def check_requirements():
     if is_pyup_branch():
-        # We recompile to fix broken formatting etc., but also want to support
-        # manual fixes to the bot's PRs and ensure there can't be a loop.
-        should_recompile = tools.last_committer() == "pyup-bot"
+        # Recompile to fix broken formatting etc., but ensure there can't be a loop.
+        should_recompile = tools.last_committer() != tools.TOOLING_COMMITER_NAME
         compile_requirements(upgrade=should_recompile)
     else:
         compile_requirements(upgrade=False)

diff --git a/whole-repo-tests/test_requirements.py b/whole-repo-tests/test_requirements.py
@@ -17,11 +17,8 @@
 
 from __future__ import absolute_import, division, print_function
 
-import pytest
-
 from hypothesistooling.__main__ import check_requirements
 
 
-@pytest.mark.skip(reason="Currently broken by pip-compile problems")
 def test_requirements():
     check_requirements()