Skip to content

Commit 63af9b1

Browse files
authored
Fix tox config and address warnings (#85)
* Update and fix tox config, update .gitignore * Address warnings - use assertRaisesRegex instead of assertRaisesRegexp - use a raw string for a regex pattern to handle escape sequences properly
1 parent 844d79c commit 63af9b1

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ dist
33

44
.eggs
55
.tox
6+
.coverage*
67
.pytest_cache
78
.idea
89

filetracker/servers/run.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080

8181

8282
def strip_margin(text):
83-
return re.sub('\n[ \t]*\|', '\n', text)
83+
return re.sub(r'\n[ \t]*\|', '\n', text)
8484

8585

8686
def main(args=None):

filetracker/tests/interaction_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,11 @@ def test_put_older_should_fail(self):
172172
self.client.get_stream('/older.txt@1')
173173

174174
def test_get_nonexistent_should_404(self):
175-
with self.assertRaisesRegexp(FiletrackerError, "404"):
175+
with self.assertRaisesRegex(FiletrackerError, "404"):
176176
self.client.get_stream('/nonexistent.txt')
177177

178178
def test_delete_nonexistent_should_404(self):
179-
with self.assertRaisesRegexp(FiletrackerError, "404"):
179+
with self.assertRaisesRegex(FiletrackerError, "404"):
180180
self.client.delete_file('/nonexistent.txt')
181181

182182
def test_delete_should_remove_file_and_dir(self):
@@ -197,7 +197,7 @@ def test_delete_should_remove_file_and_dir(self):
197197
),
198198
)
199199

200-
with self.assertRaisesRegexp(FiletrackerError, "404"):
200+
with self.assertRaisesRegex(FiletrackerError, "404"):
201201
self.client.get_stream('/dir/del.txt')
202202

203203

filetracker/tests/migration_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def test_file_version_should_return_version_from_fallback(self):
118118
)
119119

120120
def test_file_version_of_not_existent_file_should_return_404(self):
121-
with self.assertRaisesRegexp(FiletrackerError, "404"):
121+
with self.assertRaisesRegex(FiletrackerError, "404"):
122122
self.client.get_stream('/nonexistent.txt')
123123

124124

tox.ini

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
[tox]
2-
envlist=py27,py37
2+
envlist = py38,py39
33

44
[testenv]
5-
deps=pytest
6-
pytest-cov
5+
extras = server
6+
deps = pytest
7+
pytest-cov
8+
setenv =
9+
# Needed for systems with an AGPL-licensed Berkeley DB
10+
YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION = 1
711
commands = pytest --cov=./ {posargs}

0 commit comments

Comments
 (0)