Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/312235

Change subject: Polish up setup and drop pyscaffold
......................................................................

Polish up setup and drop pyscaffold

Drop pyscaffold entirely, I believe it is only meant to be a onetime
thing.  Switch to directly use pbr instead.

.gitignore AUTHORS and Changelog generated by sdist.

Add a .mailmap for git name aliasing (git shortlog, used by sdist to
craft the AUTHORS and ChangeLog file).

In tox, remove changedir. It is apparently not needed for py.test.

Change-Id: Ie2aaeb244bafb451463492b646ca8afdc989197c
---
M .gitignore
A .mailmap
M setup.py
M tox.ini
4 files changed, 7 insertions(+), 18 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/elasticsearch-tool 
refs/changes/35/312235/1

diff --git a/.gitignore b/.gitignore
index f41c0ad..92448ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,4 +38,6 @@
 docs/api/*
 docs/_build/*
 cover/*
+AUTHORS
 MANIFEST
+ChangeLog
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..a57981e
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Guillaume Lederrey <gleder...@wikimedia.org>
diff --git a/setup.py b/setup.py
index 6ad2818..8379205 100644
--- a/setup.py
+++ b/setup.py
@@ -2,22 +2,11 @@
 # -*- coding: utf-8 -*-
 """
     Setup file for estool.
-
-    This file was generated with PyScaffold 2.5.6, a tool that easily
-    puts up a scaffold for your new Python project. Learn more under:
-    http://pyscaffold.readthedocs.org/
 """
 
-import sys
-from setuptools import setup
+import setuptools
 
 
-def setup_package():
-    needs_sphinx = {'build_sphinx', 'upload_docs'}.intersection(sys.argv)
-    sphinx = ['sphinx'] if needs_sphinx else []
-    setup(setup_requires=['six', 'pyscaffold>=2.5a0,<2.6a0'] + sphinx,
-          use_pyscaffold=True)
-
-
-if __name__ == "__main__":
-    setup_package()
+setuptools.setup(
+    setup_requires=['pbr'],
+    pbr=True)
diff --git a/tox.ini b/tox.ini
index b2c2def..33c7dcd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,5 @@
 # Tox configuration file
 # Read more under https://tox.readthedocs.org/
-# THIS SCRIPT IS SUPPOSED TO BE AN EXAMPLE. MODIFY IT ACCORDING TO YOUR NEEDS!
 
 [tox]
 minversion = 1.8
@@ -8,7 +7,6 @@
 skip_missing_interpreters = True
 
 [testenv]
-changedir = tests
 commands =
     py.test {posargs}
 deps =
@@ -16,7 +14,6 @@
     -r{toxinidir}/test-requirements.txt
 
 [testenv:flake8]
-changedir = {toxinidir}
 deps = flake8
 commands = flake8 setup.py estool tests
 

-- 
To view, visit https://gerrit.wikimedia.org/r/312235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2aaeb244bafb451463492b646ca8afdc989197c
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/elasticsearch-tool
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to