Ladsgroup has submitted this change and it was merged.
Change subject: docu changes needed for 84006
......................................................................
docu changes needed for 84006
Change-Id: Ibdc7b1527837708f68690ae8c01730f0ff5661aa
---
M externals/README
M externals/__init__.py
2 files changed, 39 insertions(+), 24 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
DrTrigon: Checked; Looks good to me, but someone else must approve
diff --git a/externals/README b/externals/README
index 514dea3..33500bf 100644
--- a/externals/README
+++ b/externals/README
@@ -1,7 +1,13 @@
-External dependencies for the trunk branch.
+External dependencies for the compat repository.
Usually - under normal circumstances - these packages should be installed
separately elsewhere in the OS by the standard package managing system. This
-might not be possible for more exotic ones. Therfore several methods are used
-in following order; (svn:externals), OS package management system, download and
-extract from URL, clone of mercurial repository.
+might not be possible for more exotic ones. Therefore several methods are used
+in following order; (git:submodule), OS package management system, download and
+extract from URL, use of mercurial (or svn) repository.
+
+The essential packages (like e.g. BeautifulSoup) are PRE-INSTALLED.
+
+For more information please confer 'externals/__init__.py', which contains the
+listing of all packages needed as well as the install method used. Consider
+https://www.mediawiki.org/wiki/Manual:Pywikibot/Installation#Dependencies also.
\ No newline at end of file
diff --git a/externals/__init__.py b/externals/__init__.py
index f617ef1..355d9f9 100644
--- a/externals/__init__.py
+++ b/externals/__init__.py
@@ -20,15 +20,25 @@
#
-# supports: 0. svn:externals / git submodule
+# External dependencies for the compat repository. Please confer the docu at
+# https://www.mediawiki.org/wiki/Manual:Pywikibot/Installation#Dependencies and
+# 'externals/README' also.
+# The very essential packages are PRE-INSTALLED (e.g. 'BeautifulSoup.py'),
+# please make sure to match/sync them with the list here. Best is to first
+# update the PACKAGE in the list here and then use:
+# >>> import wikipedia, externals
+# >>> externals.check_setup('PACKAGE')
+# in order to to pull the correct version easily it into the repo for commit.
+#
+# supports: 0. 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
-# available) - still needed??
+# 2. download from url (e.g. archive, svn or git repo)
+# 3. checkout from mercurial repo ('hg clone ...' if no url is
+# available) - not needed at the moment
# (what about python eggs?!)
-# dependencies: (svn, python)
+# dependencies: (git, python)
# yum, apt-get or whatever your system uses
-# mercurial (hg)
+# mercurial (hg) / subversion (svn)
# patch (unix/linux & gnuwin32 version/flavour)
modules_needed = {
'patch.exe': ({}, # for win32 only, unix/linux is already equipped with a patch tool
@@ -36,14 +46,14 @@
'path': 'bin/patch.exe'},
{}), # OK
'crontab': ({},
-# { 'url': 'https://github.com/josiahcarlson/parse-crontab/archive/master.zip',
-# 'path': 'parse-crontab-master/crontab',}), # OK
+ #{ 'url': 'https://github.com/josiahcarlson/parse-crontab/archive/master.zip',
+ # 'path': 'parse-crontab-master/crontab',}), # OK
{ 'url': 'https://github.com/josiahcarlson/parse-crontab/archive/1ec538ff67df6a207993…',
'path': 'parse-crontab-1ec538ff67df6a207993a6c5b6988f4f628c5776/crontab',},
{}), # OK
'odf': ({},
-# { 'url': 'https://pypi.python.org/packages/source/o/odfpy/odfpy-0.9.6.tar.gz',
-# 'path': 'odfpy-0.9.6/odf',}), # OK
+ #{ 'url': 'https://pypi.python.org/packages/source/o/odfpy/odfpy-0.9.6.tar.gz',
+ # 'path': 'odfpy-0.9.6/odf',}), # OK
{ 'url': 'https://pypi.python.org/packages/source/o/odfpy/odfpy-0.9.4.tar.gz',
'path': 'odfpy-0.9.4/odf'},
{}), # OK
@@ -51,21 +61,20 @@
{ 'url': 'https://bitbucket.org/ericgazoni/openpyxl/get/1.5.6.tar.gz',
'path': 'ericgazoni-openpyxl-e5934500ffac/openpyxl'},
{}), # 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
+# git submodule: see '.gitmodules' files
+# 'spelling': $ git submodule add https://gerrit.wikimedia.org/r/p/pywikibot/spelling.git externals/spelling
'BeautifulSoup.py': ({'linux-fedora': ['python-BeautifulSoup'],
'linux-ubuntu': ['python-beautifulsoup']},
{ 'url': 'https://pypi.python.org/packages/source/B/BeautifulSoup/BeautifulSoup-3.2.0…',
'path': 'BeautifulSoup-3.2.0/BeautifulSoup.py'},
- {}), # OK
+ {}), # PRE-INSTALLED
'irclib': ({'linux-fedora': ['python-irclib'],
'linux-ubuntu': ['python-irclib']},
{}, # http://python-irclib.sourceforge.net/
{}), # OK
'mwparserfromhell': ({},
{ 'url': 'https://github.com/earwig/mwparserfromhell/archive/v0.2.zip',
-# { 'url': 'https://github.com/earwig/mwparserfromhell/archive/master.zip',
+ #{ 'url': 'https://github.com/earwig/mwparserfromhell/archive/master.zip',
'path': 'mwparserfromhell-0.2/mwparserfromhell'},
{}), # OK
'colormath': ({'linux-fedora': [],
@@ -105,8 +114,8 @@
#$ diff -Naur --exclude=".hg" --exclude=".pynative" --exclude="Notebooks" --exclude="OLD" --exclude="models" --exclude="tests" --exclude="*.pyc" --exclude="*.jpg" TEST__ocropus/ _ocropus/ > patch-ocropy
'patch': 'patch-ocropy'},
{}), # OK
-# 'opencv': $ svn propedit svn:externals externals/.
-# opencv https://svn.toolserver.org/svnroot/drtrigon/externals/opencv
+# git submodule: see '.gitmodules' files
+# 'opencv': $ git submodule add https://gerrit.wikimedia.org/r/pywikibot/opencv.git externals/opencv
# $ svn propedit svn:externals externals/opencv/haarcascades/haartraining/
# HaarTraining https://svn.toolserver.org/svnroot/drtrigon/externals/haartraining/HaarTrai…
# HaarTraining.tar.gz https://svn.toolserver.org/svnroot/drtrigon/externals/haartraining/HaarTrai…
@@ -118,8 +127,8 @@
{ 'url': 'https://github.com/wikimedia/pywikibot-bots-drtrigonbot/raw/master/external…',
'path': 'haarcascades'},
{}), # OK
-# 'pdfminer' is not used anymore/at the moment...
-# 'pycolorname': $ svn propset svn:externals 'pycolorname https://svn.toolserver.org/svnroot/drtrigon/externals/pycolorname' externals/.
+# git submodule: see '.gitmodules' files
+# 'pycolorname': $ git submodule add https://gerrit.wikimedia.org/r/pywikibot/pycolorname.git externals/pycolorname
'pydmtx': ({'linux-fedora': ['python-libdmtx'],
'linux-ubuntu': ['libdmtx-dev']},
{ 'url': 'https://github.com/dmtx/dmtx-wrappers/archive/master.zip',
@@ -201,7 +210,7 @@
if has_logger():
pywikibot.warning(text)
else:
- print "\nWARNING:", text
+ print "WARNING:", text
def guess_system():
--
To view, visit https://gerrit.wikimedia.org/r/85415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdc7b1527837708f68690ae8c01730f0ff5661aa
Gerrit-PatchSet: 3
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: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Xqt has submitted this change and it was merged.
Change subject: final pep8 v1.4.6 fixes
......................................................................
final pep8 v1.4.6 fixes
This commit makes pywikibot/core to pass the pep8 checks as of version
1.4.6. I have asked that version to be made available so we can deploy
it on the Jenkins server, once done, I guess we can cause pep8 to block
changes :)
Change-Id: I38b5499f464dbe5375b9aa130d46c200438f4800
---
M pywikibot/config2.py
M scripts/delete.py
2 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
Xqt: Looks good to me, approved
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 6c2687c..ee62581 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -143,7 +143,7 @@
exc_text += " Please check that user-config.py is stored in the correct location.\n"
exc_text += " Directory where user-config.py is searched is determined as follows:\n\n"
exc_text += " " + _get_base_dir.__doc__
-
+
raise RuntimeError(exc_text)
return base_dir
diff --git a/scripts/delete.py b/scripts/delete.py
index 2114e57..0a8e8b0 100644
--- a/scripts/delete.py
+++ b/scripts/delete.py
@@ -32,10 +32,11 @@
import pywikibot
from pywikibot import i18n, config, catlib, pagegenerators
+
class DeletionRobot:
""" This robot allows deletion of pages en masse. """
- def __init__(self, generator, summary, always = False, undelete=True):
+ def __init__(self, generator, summary, always=False, undelete=True):
""" Arguments:
* generator - A page generator.
* always - Delete without prompting?
@@ -52,9 +53,10 @@
for page in self.generator:
pywikibot.output(u'Processing page %s' % page.title())
if self.undelete:
- page.undelete(self.summary, throttle = True)
+ page.undelete(self.summary, throttle=True)
else:
- page.delete(self.summary, not self.always, throttle = True)
+ page.delete(self.summary, not self.always, throttle=True)
+
def main():
genFactory = pagegenerators.GeneratorFactory()
@@ -96,7 +98,7 @@
genFactory.handleArg(arg)
if not summary:
if arg.startswith('-category'):
- summary = i18n.twtranslate(mysite, 'delete-from-category',{'page': pageName})
+ summary = i18n.twtranslate(mysite, 'delete-from-category', {'page': pageName})
elif arg.startswith('-links'):
summary = i18n.twtranslate(mysite, 'delete-linked-pages', {'page': pageName})
elif arg.startswith('-ref'):
@@ -112,7 +114,7 @@
generator = pagegenerators.ImagesPageGenerator(page)
if not summary:
summary = pywikibot.input(u'Enter a reason for the %sdeletion:'
- % ['', 'un'][undelete])
+ % ['', 'un'][undelete])
if not generator:
generator = genFactory.getCombinedGenerator()
if not generator:
--
To view, visit https://gerrit.wikimedia.org/r/85421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I38b5499f464dbe5375b9aa130d46c200438f4800
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Hashar <hashar(a)free.fr>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot