DrTrigon has submitted this change and it was merged.
Change subject: bug fix; add spelling and simplejson (2.1.3) as git submodules
......................................................................
bug fix; add spelling and simplejson (2.1.3) as git submodules
Change-Id: I682c641831a239366c8a5af6213f9cdb511d9f19
---
M .gitmodules
M externals/__init__.py
A externals/simplejson
A externals/spelling
4 files changed, 10 insertions(+), 1 deletion(-)
Approvals:
DrTrigon: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitmodules b/.gitmodules
index 006de3b..7a21ee4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,9 @@
[submodule "i18n"]
path = i18n
url =
https://gerrit.wikimedia.org/r/p/pywikibot/i18n.git
+[submodule "externals/spelling"]
+ path = externals/spelling
+ url =
https://gerrit.wikimedia.org/r/p/pywikibot/spelling.git
+[submodule "externals/simplejson"]
+ path = externals/simplejson
+ url =
https://github.com/simplejson/simplejson.git
diff --git a/externals/__init__.py b/externals/__init__.py
index dfd4f20..89baed3 100644
--- a/externals/__init__.py
+++ b/externals/__init__.py
@@ -20,7 +20,7 @@
#
-# supports: 0. svn:externals
+# supports: 0. svn:externals / git submodule
# 1. package management system (yum, apt-get, ...)
# 2. download from url (or svn, git repo)
# 3. checkout from mercurial repo ('hg clone ...' since url not
@@ -53,8 +53,11 @@
{}), # OK
# 'spelling': $ svn propedit svn:externals externals/.
# spelling
http://svn.wikimedia.org/svnroot/pywikipedia/trunk/spelling/
+# $ git submodule add
https://gerrit.wikimedia.org/r/p/pywikibot/spelling.git externals/spelling
# 'simplejson': $ svn propedit svn:externals externals/.
# simplejson
http://simplejson.googlecode.com/svn/tags/simplejson-2.1.3/simplejson/
+# $ git submodule add
https://github.com/simplejson/simplejson.git
externals/simplejson
+# $ cd externals/simplejson; git checkout v2.1.3
# 'simplejson': ({'linux-fedora': ['python-simplejson'],
# 'linux-ubuntu': [''],},
'BeautifulSoup.py': ({'linux-fedora':
['python-BeautifulSoup'],
diff --git a/externals/simplejson b/externals/simplejson
new file mode 160000
index 0000000..04d4032
--- /dev/null
+++ b/externals/simplejson
+Subproject commit 04d4032816f7faa64912b487060d2c475f595c46
diff --git a/externals/spelling b/externals/spelling
new file mode 160000
index 0000000..203a3b7
--- /dev/null
+++ b/externals/spelling
+Subproject commit 203a3b728446466a44764bde916a3c395f564824
--
To view, visit
https://gerrit.wikimedia.org/r/76347
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I682c641831a239366c8a5af6213f9cdb511d9f19
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: DrTrigon <dr.trigon(a)surfeu.ch>
Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)gmail.com>
Gerrit-Reviewer: jenkins-bot