>
> This is the first step to create a fully automatic webservice. It will
> require some time and resources, but with this current implementation
> of sympy-bot, it is already useful and all of you can send patches to
> it to improve it.
>
This sounds really good.
> 2) run "./setup.py test"
>
That should be easy I suppose. The following should do it, but I have
no time to test right now:
diff --git a/bin/sympy-next.py b/bin/sympy-next.py
index 111d793..9ee556c 100755
--- a/bin/sympy-next.py
+++ b/bin/sympy-next.py
@@ -52,7 +52,7 @@ def read_branchfile(f):
def run_tests():
logit("Running unit tests.")
- out = subprocess.Popen(["./bin/test"],
stdout=subprocess.PIPE).stdout
+ out = subprocess.Popen(["./setup.py", "test"],
stdout=subprocess.PIPE).stdout
report = []
def my_join(file):
@@ -69,10 +69,15 @@ def my_split(iter):
buf = ''
for c in iter:
buf += c
+ # TODO make this nicer
if buf.endswith('sympy/'):
r = buf[:-6]
buf = ''
yield r
+ if buf.endswith('doc/'):
+ r = buf[:-4]
+ buf = ''
+ yield r
for line in my_split(my_join(out)):
good = None
if line.endswith('[OK]\n'):
> 3) if the merge fails, still report it, and why it failed. Currently
> sympy-next fails to generate the report, so sympy-bot submits an empty
> pastebin report as well.
>
I cannot reproduce that.
With the following branches file:
https://github.com/sympy/sympy.git master
https://github.com/goodok/sympy.git 821_Max
I get the following log:
> checkout master: git checkout master
Already on 'master'
> reset tree: git reset --hard
HEAD is now at 55d5125 Merge branch 'master' of https://github.com/sympy/sympy
> pull master: git pull https://github.com/sympy/sympy.git master
>From https://github.com/sympy/sympy
* branch master -> FETCH_HEAD
Removing sympy/concrete/sequences.py
Merge made by recursive.
sympy/concrete/__init__.py | 1 -
sympy/concrete/sequences.py | 14 ---------
sympy/matrices/matrices.py | 36 +++++++++++++++++-----
sympy/matrices/tests/test_matrices.py | 15 +++++++--
sympy/physics/hydrogen.py | 2 +-
sympy/physics/qho_1d.py | 53 +++++++++++++++++++++++++
++++++++
sympy/physics/tests/test_qho_1d.py | 34 +++++++++++++++++++++
sympy/simplify/simplify.py | 44 ++++++++++++++++++++++++
+--
sympy/simplify/tests/test_simplify.py | 16 +++++++++-
sympy/solvers/tests/test_ode.py | 13 ++++++--
sympy/solvers/tests/test_solvers.py | 16 ++++------
11 files changed, 199 insertions(+), 45 deletions(-)
delete mode 100644 sympy/concrete/sequences.py
create mode 100644 sympy/physics/qho_1d.py
create mode 100644 sympy/physics/tests/test_qho_1d.py
> switch to temporary branch: git checkout -b next-test
Switched to a new branch 'next-test'
> Merging branch 821_Max from https://github.com/goodok/sympy.git.
> Fetching branch 821_Max: git fetch https://github.com/goodok/sympy.git 821_Max
>From https://github.com/goodok/sympy
* branch 821_Max -> FETCH_HEAD
> Merge branch 821_Max: git merge FETCH_HEAD
Auto-merging sympy/utilities/tests/test_pickling.py
CONFLICT (content): Merge conflict in sympy/utilities/tests/
test_pickling.py
Automatic merge failed; fix conflicts and then commit the result.
> Error merging branch 821_Max -- skipping.: git merge --abort
> Cannot merge into master -- dropping.
> switch back to master: git checkout master
Switched to branch 'master'
> delete temporary branch: git branch -D next-test
Deleted branch next-test (was 493d772).
--
You received this message because you are subscribed to the Google Groups
"sympy" group.
To post to this group, send email to sympy@googlegroups.com.
To unsubscribe from this group, send email to
sympy+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/sympy?hl=en.
