Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/389795 )
Change subject: build: Remove outdated references to server/ ...................................................................... build: Remove outdated references to server/ The development version of the EventLogging server has not been maintained in this repository since sometime in 2015. All code related to the EventLogging server is now in wikimedia/eventlogging.git. The MediaWiki extension in this repository is purely an EventLogging client in JS, and PHP. Also remove the Travis CI config as it has been failing for years and is redundant with the Jenkins jobs already running from Gerrit. Change-Id: I2a6eb3dfa1b7aa8e707a35718e16103709fe7579 --- M .gitignore D .gitmodules M .jshintignore M .phpcs.xml D .travis.yml M README M includes/ResourceLoaderSchemaModule.php D server D tox.ini 9 files changed, 12 insertions(+), 65 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging refs/changes/95/389795/1 diff --git a/.gitignore b/.gitignore index 1b5201d..7a94899 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,7 @@ -*.egg -*.egg-info -*.kate-swp -*.pyo -*.pyc *~ .*.swp -.pylintrc -.tox -__pycache__ -server/build -server/dist -server/env -server/.coverage -tests/suite.php -.deploy -node_modules/ -docs/ -composer.lock -vendor +/tests/suite.php +/node_modules/ +/docs/ +/composer.lock +/vendor diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 648bd61..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "server"] - path = server - url = https://gerrit.wikimedia.org/r/eventlogging diff --git a/.jshintignore b/.jshintignore index c0a11b8..49152c8 100644 --- a/.jshintignore +++ b/.jshintignore @@ -1,4 +1,4 @@ -server/.tox -modules/out -node_modules -docs +/docs +/modules/out +/node_modules +/vendor diff --git a/.phpcs.xml b/.phpcs.xml index b212fa2..d473d2b 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -11,5 +11,4 @@ <file>.</file> <arg name="extensions" value="php,php5,inc" /> <arg name="encoding" value="UTF-8" /> - <exclude-pattern type="relative">^server/*</exclude-pattern> </ruleset> diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6f335fa..0000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Test configuration for Travis CI. See <https://travis-ci.org/>. -language: python -python: - - "2.7" - - "3.4" -install: - - pip install -q pyzmq --install-option="--zmq=bundled" - - pip install -q server/ -script: - - cd server - - python setup.py test -notifications: - irc: "irc.freenode.org#wikimedia-analytics" - on_success: change - on_failure: change diff --git a/README b/README index 1d489c2..a1b74ce 100644 --- a/README +++ b/README @@ -1,2 +1,2 @@ -For information on how to install and use this extension, please see: +For information on how to install and use this extension, please see: <https://www.mediawiki.org/wiki/Extension:EventLogging> diff --git a/includes/ResourceLoaderSchemaModule.php b/includes/ResourceLoaderSchemaModule.php index 2372fdb..24cd8f1 100644 --- a/includes/ResourceLoaderSchemaModule.php +++ b/includes/ResourceLoaderSchemaModule.php @@ -44,9 +44,8 @@ } if ( !is_int( $args['revision'] ) ) { - // Events will not validate on the Python server if this is defined - // wrong. Enforce it here as well, so it can be more easily caught - // during local development. + // Events will not validate on the EventLogging server if this is defined + // wrong. Enforce it here as well, so it can be easily caught during development. throw new Exception( "Revision for schema \"{$args['schema']}\" must be given as an integer" ); } diff --git a/server b/server deleted file mode 160000 index 68fbd10..0000000 --- a/server +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 68fbd10a92a38d3a0d79280e6c0ed9619f337505 diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 41e9684..0000000 --- a/tox.ini +++ /dev/null @@ -1,19 +0,0 @@ -# tox wrapper for /server/tox.ini - -[tox] -setupdir={toxinidir}/server -skipsdist = true - -[testenv] -commands = tox -c {toxinidir}/server/tox.ini -e {envname} -changedir={toxinidir}/server -deps = tox - -# Redefine envs from /server/tox.ini -# Python 3.x is not supported due to dependencies - -[testenv:py27] - -[testenv:flake8] - -[testenv:flake8-bin] -- To view, visit https://gerrit.wikimedia.org/r/389795 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a6eb3dfa1b7aa8e707a35718e16103709fe7579 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EventLogging Gerrit-Branch: master Gerrit-Owner: Krinkle <krinklem...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
