Skip to content

Commit

Permalink
Merge pull request #273 from transifex/dependency-versions
Browse files Browse the repository at this point in the history
Loosen up dependency versions
  • Loading branch information
deathbird authored Dec 18, 2019
2 parents b5517dc + 9fb3bfd commit f941850
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
urllib3>=1.24.2,<1.25
six==1.11.0
urllib3>=1.24.2,<2.0.0
six<2.0.0
requests>=2.19.1,<3.0.0
python-slugify==1.2.6
python-slugify<2.0.0
8 changes: 4 additions & 4 deletions tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def test_makes_request_with_proxy(self, mock_manager):

# Test http
host = 'http://whynotestsforthisstuff.com'
with patch.dict(os.environ, {'http_proxy': 'host:333'}):
with patch.dict(os.environ, {'http_proxy': 'proxy.host:333'}):
utils.make_request(
'GET',
host,
Expand All @@ -89,12 +89,12 @@ def test_makes_request_with_proxy(self, mock_manager):
)
mock_manager.assert_called_once_with(num_pools=1,
proxy_headers=Any(),
proxy_url='http://host:333')
proxy_url='http://proxy.host:333')
mock_connection.request.assert_called_once()

# Test https
host = 'https://whynotestsforthisstuff.com'
with patch.dict(os.environ, {'https_proxy': 'host:333'}):
with patch.dict(os.environ, {'https_proxy': 'proxy.host:333'}):
utils.make_request(
'GET',
host,
Expand All @@ -104,7 +104,7 @@ def test_makes_request_with_proxy(self, mock_manager):
)
mock_manager.assert_called_with(num_pools=1,
proxy_headers=Any(),
proxy_url='https://host:333',
proxy_url='https://proxy.host:333',
ca_certs=Any(),
cert_reqs=Any())
self.assertEqual(mock_connection.request.call_count, 2)
Expand Down

0 comments on commit f941850

Please sign in to comment.