Opened 11 years ago
Closed 10 years ago
#8792 closed enhancement (fixed)
clean up documentation of logic/booleval.py
Reported by: | mvngu | Owned by: | mvngu |
---|---|---|---|
Priority: | major | Milestone: | sage-4.6.1 |
Component: | documentation | Keywords: | |
Cc: | leif | Merged in: | sage-4.6.1.alpha1 |
Authors: | Minh Van Nguyen | Reviewers: | John Thurber |
Report Upstream: | N/A | Work issues: | |
Branch: | Commit: | ||
Dependencies: | Stopgaps: |
Description (last modified by )
Attachments (1)
Change History (18)
comment:1 Changed 11 years ago by
- Description modified (diff)
Changed 11 years ago by
comment:2 Changed 11 years ago by
- Description modified (diff)
- Status changed from new to needs_review
comment:3 follow-up: ↓ 4 Changed 11 years ago by
- Status changed from needs_review to needs_work
If I'm not mistaken, this patch does not apply against the brand new 4.4.2 with #8796 ;
Nathann
comment:4 in reply to: ↑ 3 Changed 11 years ago by
- Status changed from needs_work to needs_review
Replying to ncohen:
If I'm not mistaken, this patch does not apply against the brand new 4.4.2 with #8796 ;
Could you try again? Here is how I applied the relevant patches:
[mvngu@sage sage-main]$ pwd /dev/shm/mvngu/sandbox/sage-4.4.2-8792-booleval/devel/sage-main [mvngu@sage sage-main]$ hg tip changeset: 14321:1451c00a8d44 tag: tip user: Minh Van Nguyen <nguyenminh2@gmail.com> date: Wed May 19 00:55:29 2010 -0700 summary: 4.4.2 [mvngu@sage sage-main]$ hg qimport http://trac.sagemath.org/sage_trac/raw-attachment/ticket/8796/trac_8796-propcalc-clean-ups.patch && hg qpush adding trac_8796-propcalc-clean-ups.patch to series file applying trac_8796-propcalc-clean-ups.patch now at: trac_8796-propcalc-clean-ups.patch [mvngu@sage sage-main]$ hg qimport http://trac.sagemath.org/sage_trac/raw-attachment/ticket/8792/trac_8792-booleval-clean-ups.patch && hg qpush adding trac_8792-booleval-clean-ups.patch to series file applying trac_8792-booleval-clean-ups.patch now at: trac_8792-booleval-clean-ups.patch [mvngu@sage sage-main]$ hg tip changeset: 14323:a91966275ff3 tag: qtip tag: trac_8792-booleval-clean-ups.patch tag: tip user: Minh Van Nguyen <nguyenminh2@gmail.com> date: Sun May 02 20:59:37 2010 -0700 summary: #8792: clean up documentation of logic/booleval.py
comment:5 Changed 11 years ago by
Hmmmm... I'm really sorry but ...
~/.Sage/devel/sage-doc$ pwd /home/ncohen/.Sage/devel/sage-doc ~/.Sage/devel/sage-doc$ hg tip changeset: 14321:1451c00a8d44 tag: tip user: Minh Van Nguyen <nguyenminh2@gmail.com> date: Wed May 19 00:55:29 2010 -0700 summary: 4.4.2 ~/.Sage/devel/sage-doc$ hg qimport http://trac.sagemath.org/sage_trac/raw-attachment/ticket/8796/trac_8796-propcalc-clean-ups.patch && hg qpush adding trac_8796-propcalc-clean-ups.patch to series file applying trac_8796-propcalc-clean-ups.patch now at: trac_8796-propcalc-clean-ups.patch ~/.Sage/devel/sage-doc$ hg qimport http://trac.sagemath.org/sage_trac/raw-attachment/ticket/8792/trac_8792-booleval-clean-ups.patch && hg qpush adding trac_8792-booleval-clean-ups.patch to series file applying trac_8792-booleval-clean-ups.patch patching file sage/logic/booleval.py Hunk #6 FAILED at 111 1 out of 6 hunks FAILED -- saving rejects to file sage/logic/booleval.py.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh trac_8792-booleval-clean-ups.patch ~/.Sage/devel/sage-doc$ hg tip changeset: 14323:fd8399a20ce0 tag: qtip tag: trac_8792-booleval-clean-ups.patch tag: tip user: Minh Van Nguyen <nguyenminh2@gmail.com> date: Sun May 02 20:59:37 2010 -0700 summary: #8792: clean up documentation of logic/booleval.py
is there anything I am doing wrong ? O_o
comment:6 follow-up: ↓ 8 Changed 11 years ago by
The rejects are all the fixes (a==b) => a == b at the end of your patch O_o
Nathann
comment:7 Changed 11 years ago by
- Cc leif added
comment:8 in reply to: ↑ 6 ; follow-up: ↓ 9 Changed 10 years ago by
Replying to ncohen:
The rejects are all the fixes (a==b) => a == b at the end of your patch O_o
Nathann
Hi,
I'm new to development and thought this patch looked like a good place to start. I got the same error message as Nathann. Is this patch still receiving attention?
John
comment:9 in reply to: ↑ 8 Changed 10 years ago by
Replying to jthurber:
I'm new to development and thought this patch looked like a good place to start. I got the same error message as Nathann. Is this patch still receiving attention?
By commenting on the ticket, it does. ;-)
Though I personally currently have no time for it. Feel free to review it / upload a reviewer patch and we'll see...
P.S.: If the current patch doesn't apply cleanly, the ticket's status should be set to "needs work" until the patch has been rebased.
comment:10 Changed 10 years ago by
$ hg import -v ~/Sage/patches/trac_8792-booleval-clean-ups.patch
applying /home/leif/Sage/patches/trac_8792-booleval-clean-ups.patch
patching file doc/en/reference/logic.rst
patching file sage/logic/booleval.py
doc/en/reference/logic.rst
sage/logic/booleval.py
(This is with Sage 4.6. Documentation apparently builds ok, too, doctests pass.)
comment:11 follow-up: ↓ 12 Changed 10 years ago by
It also works for me with sage-4.6.
comment:12 in reply to: ↑ 11 Changed 10 years ago by
07:26:25johnthurber~/sage/sage-4.6/devel/sage-test$ hg qimport ~/sage/patches/trac_8792-booleval-clean-ups-2.patch adding trac_8792-booleval-clean-ups-2.patch to series file 07:34:56johnthurber~/sage/sage-4.6/devel/sage-test$ hg qpush applying trac_8792-booleval-clean-ups-2.patch patching file sage/logic/booleval.py Hunk #6 FAILED at 111 1 out of 6 hunks FAILED -- saving rejects to file sage/logic/booleval.py.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh trac_8792-booleval-clean-ups-2.patch
I wondered if it was my download technique, but I've tried it a couple of ways, including
hg qimport http://trac.sagemath.org/sage_trac/raw-attachment/ticket/8792/trac_8792-booleval-clean-ups.patch
so, unless someone has another suggestion, I will go ahead and suggest this needs to be rebased.
comment:13 Changed 10 years ago by
Hi,
I figured it out. jthurber is using hg version 1.6, whereas Sage uses hg version 1.3. With 1.6 the algorithm for accepting hunks has been tightened (surely a good thing!) and the patch fails to apply, whereas it does apply with hg version 1.3.
comment:14 Changed 10 years ago by
- Status changed from needs_review to positive_review
Positive review, though there was one test timeout failure which passed when isolated from --testall.
--testall --long led to
sage -t --long -force_lib "devel/sage/sage/modular/ssmod/ssmod.py" *** *** Error: TIMED OUT! PROCESS KILLED! *** ***
I isolated this test, it passed:
07:36:53johnthurber~/sage/sage-4.6$ sage -t --long -force_lib "devel/sage/sage/modular/ssmod/ssmod.py" sage -t --long -force_lib "devel/sage/sage/modular/ssmod/ssmod.py" [276.0 s] ---------------------------------------------------------------------- All tests passed! Total time for all tests: 276.0 seconds }}
comment:15 Changed 10 years ago by
jthurber: Please add your real name as "Reviewer" and also on Account Names mapped to Real Names
comment:16 Changed 10 years ago by
- Reviewers set to John Thurber
comment:17 Changed 10 years ago by
- Merged in set to sage-4.6.1.alpha1
- Resolution set to fixed
- Status changed from positive_review to closed
Changes in the patch include:
sage/logic/booleval.py
to the reference manual.vars
of a built-in function for a variable name.