Chad has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404829 )
Change subject: Make config useful
......................................................................
Make config useful
Change-Id: Ia7602043e971401733c688b374e175d33bc84084
---
M make-release/.gitignore
M make-release/branch.py
R make-release/settings.yaml
M make-release/tests/test_makerelease-yaml.py
4 files changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/29/404829/1
diff --git a/make-release/.gitignore b/make-release/.gitignore
index 41730ff..6b6276c 100644
--- a/make-release/.gitignore
+++ b/make-release/.gitignore
@@ -1,2 +1,3 @@
*.gz
/build/
+.settings.yaml
diff --git a/make-release/branch.py b/make-release/branch.py
index 559cdc9..7b4f91e 100755
--- a/make-release/branch.py
+++ b/make-release/branch.py
@@ -19,8 +19,14 @@
from pygerrit2.rest import GerritRestAPI
-with open("make-release.yaml") as conf:
- CONFIG = yaml.safe_load(conf)
+# Setup config with local overrides
+with open('settings.yaml') as globalconf:
+ CONFIG = yaml.safe_load(globalconf)
+if os.path.exists('.settings.yaml'):
+ with open(".settings.yaml") as localconf:
+ LOCAL_CONFIG = yaml.safe_load(localconf)
+ if LOCAL_CONFIG:
+ CONFIG = {**CONFIG, **LOCAL_CONFIG}
def _get_client():
diff --git a/make-release/make-release.yaml b/make-release/settings.yaml
similarity index 100%
rename from make-release/make-release.yaml
rename to make-release/settings.yaml
diff --git a/make-release/tests/test_makerelease-yaml.py
b/make-release/tests/test_makerelease-yaml.py
index f33790d..f7aea4b 100644
--- a/make-release/tests/test_makerelease-yaml.py
+++ b/make-release/tests/test_makerelease-yaml.py
@@ -5,7 +5,7 @@
def test_valid_syntax():
fname = os.path.join(
os.path.dirname(os.path.dirname(__file__)),
- 'make-release.yaml'
+ 'settings.yaml'
)
with open(fname) as conf:
--
To view, visit https://gerrit.wikimedia.org/r/404829
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7602043e971401733c688b374e175d33bc84084
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
