Skip to content

Commit

Permalink
Merge pull request #33 from ClearcodeHQ/requires-io-master
Browse files Browse the repository at this point in the history
[requires.io] dependency update on master branch
  • Loading branch information
fizyk committed Nov 4, 2016
2 parents 23be2e2 + cb2de88 commit 365e4e6
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# test runs requirements (versions we'll be testing against) - automatically updated by requires.io
coverage==4.2 # pytest-cov
pylama==7.2.3
pyflakes==1.3.0
pydocstyle==1.1.1
pycodestyle==2.0.0
pycodestyle==2.1.0
mccabe==0.5.2
pyroma==2.2
pytest==3.0.3 # rq.filter: !=2.9.0,!=2.9.1,!=2.9.2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ def read(fname):
"""
return open(os.path.join(here, fname)).read()


requirements = [
'pytest>=3.0.0',
'mirakuru',
Expand All @@ -45,7 +46,6 @@ def read(fname):
test_requires = [
'pytest-cov==2.4.0',
'pytest-xdist==1.15.0',
'pylama==7.2.3',
'mock==2.0.0',
]

Expand Down
1 change: 1 addition & 0 deletions src/pytest_elasticsearch/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,5 +137,6 @@ def pytest_addoption(parser):
help=_help_port
)


elasticsearch_proc = factories.elasticsearch_proc()
elasticsearch = factories.elasticsearch('elasticsearch_proc')
1 change: 1 addition & 0 deletions tests/test_elastic.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ def test_ini_option_configuration(request):

assert '/test2' == factories.return_config(request)['logsdir']


elasticsearch_proc_args = factories.elasticsearch_proc(
port=None, elasticsearch_logsdir='/tmp')

Expand Down

0 comments on commit 365e4e6

Please sign in to comment.