Rfaulk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91354
Change subject: mod - remove config_local deps.
......................................................................
mod - remove config_local deps.
Change-Id: Iebc8c248568c25f66fca9ecbca833578c7d09377
---
M sartoris/tests/test.py
M scripts/init.py
2 files changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/sartoris refs/changes/54/91354/1
diff --git a/sartoris/tests/test.py b/sartoris/tests/test.py
index d75b435..d4d0da0 100644
--- a/sartoris/tests/test.py
+++ b/sartoris/tests/test.py
@@ -12,15 +12,18 @@
from collections import namedtuple
from sartoris.config import log
from sartoris.sartoris import Sartoris, SartorisError, exit_codes
-from sartoris import config_local
from dulwich.repo import Repo
from os import mkdir, chdir
from os.path import exists
from shutil import rmtree
+from sartoris.config import configure
+
+
# Create the initial singleton
-Sartoris(path=config_local.TEST_REPO,
- client_path=config_local.TEST_REPO)
+config = configure()
+Sartoris(path=config['deploy.test_repo'],
+ client_path=config['deploy.test_repo'])
def setup_deco(test_method):
diff --git a/scripts/init.py b/scripts/init.py
index a66cebe..0f32ed6 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -12,9 +12,7 @@
import subprocess
import shutil
-from sartoris.config_local import PROJECT_HOME
-
-INI_FILE = PROJECT_HOME + 'scripts/sartoris.ini'
+INI_FILE = 'scripts/sartoris.ini'
log_format = "%(asctime)s %(levelname)-8s %(message)s"
handler = logging.StreamHandler(sys.stderr)
@@ -50,7 +48,7 @@
# cp git-deploy
if section == 'system' and name == 'run_root':
- shutil.copy(PROJECT_HOME + 'sartoris/git-deploy', value)
+ shutil.copy('sartoris/git-deploy', value)
def cli():
--
To view, visit https://gerrit.wikimedia.org/r/91354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebc8c248568c25f66fca9ecbca833578c7d09377
Gerrit-PatchSet: 1
Gerrit-Project: sartoris
Gerrit-Branch: master
Gerrit-Owner: Rfaulk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
