Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scheduled weekly dependency update for week 48 #990

Merged
merged 5 commits into from
Nov 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions RELEASE.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
RELEASE_TYPE: patch

This patch changes a few byte-string literals from double to single quotes,
thanks to an update in :pypi:`unify`. There are no user-visible changes.
6 changes: 3 additions & 3 deletions requirements/tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jinja2==2.10 # via pyupio, sphinx
markupsafe==1.0 # via jinja2
mccabe==0.6.1 # via flake8
packaging==16.8 # via dparse, pyupio, safety
pip-tools==1.10.1
pip-tools==1.10.2
pkginfo==1.4.1 # via twine
pluggy==0.5.2 # via tox
pluggy==0.6.0 # via tox
py==1.5.2 # via pytest, tox
pycodestyle==2.3.1 # via autopep8, flake8
pyflakes==1.6.0 # via autoflake, flake8
Expand All @@ -54,7 +54,7 @@ sphinxcontrib-websupport==1.0.1 # via sphinx
tox==2.9.1
tqdm==4.19.4 # via pyupio, twine
twine==1.9.1
unify==0.3 # via pyformat
unify==0.4 # via pyformat
untokenize==0.1.1 # via docformatter, unify
urllib3==1.22 # via requests
virtualenv==15.1.0 # via tox
4 changes: 2 additions & 2 deletions scripts/hypothesistooling.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def current_branch():
def tags():
result = [t.decode('ascii') for t in subprocess.check_output([
'git', 'tag'
]).split(b"\n")]
]).split(b'\n')]
assert len(set(result)) == len(result)
return set(result)

Expand Down Expand Up @@ -194,7 +194,7 @@ def modified_files():
for l in diff_output.split('\n'):
filepath = l.strip()
if filepath:
assert os.path.exists(filepath)
assert os.path.exists(filepath), filepath
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I put this in to debug some local problems I was having (for some reason, check-release-file.py had vanished and I was getting the Python header prepended to our requirements file), but I don't think it's a bad change, so I'm going to leave it in.

files.add(filepath)
return files

Expand Down
4 changes: 2 additions & 2 deletions src/hypothesis/internal/conjecture/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -368,11 +368,11 @@ def downgrade_buffer(self, buffer):

@property
def secondary_key(self):
return b'.'.join((self.database_key, b"secondary"))
return b'.'.join((self.database_key, b'secondary'))

@property
def covering_key(self):
return b'.'.join((self.database_key, b"coverage"))
return b'.'.join((self.database_key, b'coverage'))

def note_details(self, data):
if data.status == Status.INTERESTING:
Expand Down
12 changes: 6 additions & 6 deletions tests/cover/test_database_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@ def test_selects_sqlite_database_if_name_matches(tmpdir):

def test_selects_directory_based_if_already_directory(tmpdir):
path = str(tmpdir.join('hi.sqlite3'))
DirectoryBasedExampleDatabase(path).save(b"foo", b"bar")
DirectoryBasedExampleDatabase(path).save(b'foo', b'bar')
assert isinstance(ExampleDatabase(path), DirectoryBasedExampleDatabase)


@checks_deprecated_behaviour
def test_selects_sqlite_if_already_sqlite(tmpdir):
path = str(tmpdir.join('hi'))
SQLiteExampleDatabase(path).save(b"foo", b"bar")
SQLiteExampleDatabase(path).save(b'foo', b'bar')
assert isinstance(ExampleDatabase(path), SQLiteExampleDatabase)


Expand Down Expand Up @@ -169,13 +169,13 @@ def test_class_name_is_in_repr(exampledatabase):


def test_an_absent_value_is_present_after_it_moves(exampledatabase):
exampledatabase.move(b"a", b"b", b"c")
assert next(exampledatabase.fetch(b"b")) == b'c'
exampledatabase.move(b'a', b'b', b'c')
assert next(exampledatabase.fetch(b'b')) == b'c'


def test_an_absent_value_is_present_after_it_moves_to_self(exampledatabase):
exampledatabase.move(b"a", b"a", b"b")
assert next(exampledatabase.fetch(b"a")) == b'b'
exampledatabase.move(b'a', b'a', b'b')
assert next(exampledatabase.fetch(b'a')) == b'b'


def test_two_directory_databases_can_interact(tmpdir):
Expand Down
8 changes: 4 additions & 4 deletions tests/cover/test_database_usage.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def has_a_non_zero_byte(x):


def test_saves_incremental_steps_in_database():
key = b"a database key"
key = b'a database key'
database = InMemoryExampleDatabase()
find(
st.binary(min_size=10), lambda x: has_a_non_zero_byte(x),
Expand All @@ -42,7 +42,7 @@ def test_saves_incremental_steps_in_database():


def test_clears_out_database_as_things_get_boring():
key = b"a database key"
key = b'a database key'
database = InMemoryExampleDatabase()
do_we_care = True

Expand Down Expand Up @@ -73,7 +73,7 @@ def stuff():


def test_trashes_invalid_examples():
key = b"a database key"
key = b'a database key'
database = InMemoryExampleDatabase()
finicky = False

Expand All @@ -96,7 +96,7 @@ def stuff():


def test_respects_max_examples_in_database_usage():
key = b"a database key"
key = b'a database key'
database = InMemoryExampleDatabase()
do_we_care = True
counter = [0]
Expand Down