DrTrigon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/76350
Change subject: improvement; change external simplejson from git submodule to
internal management
......................................................................
improvement; change external simplejson from git submodule to internal
management
Change-Id: Ic0e2e9ca1c631088674fff7728e9a82df88bcf22
---
M .gitmodules
M externals/__init__.py
D externals/simplejson
3 files changed, 5 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat
refs/changes/50/76350/1
diff --git a/.gitmodules b/.gitmodules
index 7a21ee4..3ceaddf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,3 @@
[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 89baed3..e9cd061 100644
--- a/externals/__init__.py
+++ b/externals/__init__.py
@@ -54,12 +54,11 @@
# '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': [''],},
+ 'simplejson': ({'linux-fedora': ['python-simplejson'],
+ 'linux-ubuntu': ['']},
+ { 'url':
'https://github.com/simplejson/simplejson/archive/v2.1.3.zip',
+ 'path': 'simplejson-2.1.3/simplejson'},
+ {}), # ??
'BeautifulSoup.py': ({'linux-fedora': ['python-BeautifulSoup'],
'linux-ubuntu': ['']},
{ 'url':
'https://pypi.python.org/packages/source/B/BeautifulSoup/BeautifulSoup-3.2.0.tar.gz',
diff --git a/externals/simplejson b/externals/simplejson
deleted file mode 160000
index 04d4032..0000000
--- a/externals/simplejson
+++ /dev/null
-Subproject commit 04d4032816f7faa64912b487060d2c475f595c46
--
To view, visit https://gerrit.wikimedia.org/r/76350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0e2e9ca1c631088674fff7728e9a82df88bcf22
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: DrTrigon <dr.tri...@surfeu.ch>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
