Merge "Update hacking for Python3"
This commit is contained in:
commit
257d6e42b0
@ -7,11 +7,9 @@ docutils==0.11
|
||||
dulwich==0.15.0
|
||||
extras==1.0.0
|
||||
fixtures==3.0.0
|
||||
flake8==2.5.5
|
||||
future==0.16.0
|
||||
gitdb==0.6.4
|
||||
GitPython==1.0.1
|
||||
hacking==0.12.0
|
||||
imagesize==0.7.1
|
||||
iso8601==0.1.11
|
||||
Jinja2==2.10
|
||||
@ -27,8 +25,6 @@ os-testr==1.0.0
|
||||
oslosphinx==4.7.0
|
||||
oslotest==3.2.0
|
||||
pbr==2.0.0
|
||||
pep8==1.5.7
|
||||
pyflakes==0.8.1
|
||||
Pygments==2.2.0
|
||||
python-mimeparse==1.6.0
|
||||
python-subunit==1.0.0
|
||||
|
@ -1,7 +1,7 @@
|
||||
# The order of packages is significant, because pip processes them in the order
|
||||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
hacking>=1.1.0,<1.2.0 # Apache-2.0
|
||||
hacking>=3.0,<3.1.0 # Apache-2.0
|
||||
bandit>=1.1.0 # Apache-2.0
|
||||
coverage!=4.4,>=4.0 # Apache-2.0
|
||||
mock>=2.0.0 # BSD
|
||||
|
@ -274,7 +274,8 @@ class TestMonascaStatsd(unittest.TestCase):
|
||||
timer.timing('timer', 123)
|
||||
self.client.connection.close_buffer()
|
||||
|
||||
self.assertEqual(six.b("site.views:123|g|#{'env': 'test'}\nsite.timer:123|g|#{'env': 'test'}"),
|
||||
self.assertEqual(six.b("site.views:123|g|#{'env': 'test'}\n"
|
||||
"site.timer:123|g|#{'env': 'test'}"),
|
||||
self.recv(gauge))
|
||||
|
||||
def test_context_manager(self):
|
||||
@ -307,5 +308,6 @@ class TestMonascaStatsd(unittest.TestCase):
|
||||
b,
|
||||
delta)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
Loading…
Reference in New Issue
Block a user