From d42ee6a36c04c69948cff2feb78d8937a9e42064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Mas=C5=82owski?= Date: Mon, 23 Jan 2017 10:38:31 +0100 Subject: [PATCH] Use os.path instead of path.py --- requirements-test.txt | 1 - setup.py | 1 - src/pytest_elasticsearch/factories.py | 19 +++++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/requirements-test.txt b/requirements-test.txt index 2c1d1ba6..fc289f8d 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -7,5 +7,4 @@ pycodestyle==2.2.0 mccabe==0.5.3 pyroma==2.2 pytest==3.0.6 # rq.filter: !=2.9.0,!=2.9.1,!=2.9.2 -path.py==10.0 port-for==0.3.1 diff --git a/setup.py b/setup.py index f0cb6934..59378710 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,6 @@ def read(fname): 'pytest>=3.0.0', 'mirakuru', 'elasticsearch', - 'path.py>=6.2', 'port-for', ] diff --git a/src/pytest_elasticsearch/factories.py b/src/pytest_elasticsearch/factories.py index d9d380be..985e216d 100644 --- a/src/pytest_elasticsearch/factories.py +++ b/src/pytest_elasticsearch/factories.py @@ -16,11 +16,11 @@ # You should have received a copy of the GNU Lesser General Public License # along with pytest-elasticsearch. If not, see . """Fixture factories.""" +import os.path import shutil from tempfile import gettempdir import pytest -from path import Path from elasticsearch import Elasticsearch from mirakuru import HTTPExecutor @@ -80,7 +80,7 @@ def elasticsearch_proc(executable='/usr/share/elasticsearch/bin/elasticsearch', @pytest.fixture(scope='session') def elasticsearch_proc_fixture(request): """Elasticsearch process starting fixture.""" - tmpdir = Path(gettempdir()) + tmpdir = gettempdir() config = return_config(request) elasticsearch_host = host or config['host'] @@ -97,13 +97,16 @@ def elasticsearch_proc_fixture(request): config['network_publish_host'] logsdir = elasticsearch_logsdir or config['logsdir'] - logs_path = Path(logsdir) / '{prefix}elasticsearch_{port}_logs'.format( - prefix=elasticsearch_logs_prefix, - port=elasticsearch_port - ) + logs_path = os.path.join( + logsdir, '{prefix}elasticsearch_{port}_logs'.format( + prefix=elasticsearch_logs_prefix, + port=elasticsearch_port + )) - pidfile = tmpdir / 'elasticsearch.{0}.pid'.format(elasticsearch_port) - home_path = tmpdir / 'elasticsearch_{0}'.format(elasticsearch_port) + pidfile = os.path.join( + tmpdir, 'elasticsearch.{0}.pid'.format(elasticsearch_port)) + home_path = os.path.join( + tmpdir, 'elasticsearch_{0}'.format(elasticsearch_port)) work_path = '{0}_tmp'.format(home_path) if discovery_zen_ping_multicast_enabled is not None: