Updating docs

9 views
Skip to first unread message

Skipper Seabold

unread,
Mar 6, 2012, 6:20:12 PM3/6/12
to pystat...@googlegroups.com
The docs in master are down to zero warnings again.

I also added the graphics module. I added the ones that looked
sensible to add but feel free to change this. These are a great
candidate for having a separate rest file that uses the
ipython_directive for plotting. Then we can write some code to have a
gallery of thumbnails where clicking takes you to that example.

I will probably merge in the rst-examples pull request later tonight
if there are no objections. It isn't set to happen on windows. The
batch file just needs to call the example_rst in the tools directory,
but coding relative paths in windows batch files is not my cup of tea.
This is just a detail though as the docs that are pushed online are
built on linux (and need to be fixed again after recent changes).

Skipper

josef...@gmail.com

unread,
Mar 6, 2012, 9:47:53 PM3/6/12
to pystat...@googlegroups.com

I will look at it once it's compatible with or merged into master

I tried to merge rst-examples2 into master (a temp) but got several
conflicts, some look a bit messy, especially the error message at the
end

CONFLICT (content): Merge conflict in statsmodels/examples/example_kde.py
CONFLICT (rename/rename): Rename
"scikits/statsmodels/examples/example_rlm.py"->"statsmodels/examples/example_rlm.py"
in branch "HEAD" rename
"scikits/statsmodels/examples/example_rlm.py"->"examples/example_rlm.py"
in "skipper/rst-examples2"
CONFLICT (rename/rename): Rename
"scikits/statsmodels/examples/example_rlm.py"->"statsmodels/examples/example_rlm.py"
in branch "HEAD" rename
"scikits/statsmodels/examples/example_rlm.py"->"examples/example_rlm.py"
in "skipper/rst-examples2"
Automatic merge failed; fix conflicts and then commit the result.
error: refusing to lose untracked file at 'examples/example_rlm.py'
error: refusing to lose untracked file at 'examples/example_rlm.py'

Josef

>
> Skipper

Skipper Seabold

unread,
Mar 7, 2012, 10:05:03 AM3/7/12
to pystat...@googlegroups.com
On Tue, Mar 6, 2012 at 9:47 PM, <josef...@gmail.com> wrote:
> On Tue, Mar 6, 2012 at 6:20 PM, Skipper Seabold <jsse...@gmail.com> wrote:
>> The docs in master are down to zero warnings again.
>>
>> I also added the graphics module. I added the ones that looked
>> sensible to add but feel free to change this. These are a great
>> candidate for having a separate rest file that uses the
>> ipython_directive for plotting. Then we can write some code to have a
>> gallery of thumbnails where clicking takes you to that example.
>>
>> I will probably merge in the rst-examples pull request later tonight
>> if there are no objections. It isn't set to happen on windows. The
>> batch file just needs to call the example_rst in the tools directory,
>> but coding relative paths in windows batch files is not my cup of tea.
>> This is just a detail though as the docs that are pushed online are
>> built on linux (and need to be fixed again after recent changes).
>
> I will look at it once it's compatible with or merged into master
>

PR is rebased on master. Had to fix a spacing bug in ipython_directive.

> I tried to merge rst-examples2 into master (a temp) but got several
> conflicts, some look a bit messy, especially the error message at the
> end
>

What happened is that we had two files named run_all.py and they were
both moved by these branches.
scikits/statsmodels/sandbox/examples/run_all.py ->
statsmodels/.../run_all.py and scikits/statsmodels/examples/run_all.py
-> examples/run_all.py, which looks to have confused git oddly. Git
made it pretty easy to sort it out though.

Skipper

Reply all
Reply to author
Forward
0 new messages