search

jrleeman / rsfmodel

Rate and state frictional solver
MIT License
31 stars 12 forks source link

Fix docs #41

Closed jrleeman closed 8 years ago

jrleeman commented 8 years ago

I had to add a requirements file to get numpydoc to install for readthedocs to build. Things build now, but still have some issue because the page generated doesn't have anything from the docstrings. http://rsfmodel.readthedocs.org/en/fixdocs/

dopplershift commented 8 years ago

I'd use rebase to squash these together once you have it working.

jrleeman commented 8 years ago

Any idea on why the docs build, but without the proper content? A local build works fine…

On Oct 29, 2015, at 10:44 AM, Ryan May notifications@github.com wrote:

I'd use rebase to squash these together once you have it working.

— Reply to this email directly or view it on GitHub https://github.com/jrleeman/rsfmodel/pull/41#issuecomment-152201765.

dopplershift commented 8 years ago

Any of those solve it?

jrleeman commented 8 years ago

Yep. Just adding missing docstrings now. Finally chased all the conspiring factors down.

On Nov 2, 2015, at 2:32 PM, Ryan May notifications@github.com wrote:

Any of those solve it?

— Reply to this email directly or view it on GitHub https://github.com/jrleeman/rsfmodel/pull/41#issuecomment-153133545.

jrleeman commented 8 years ago

OK, I think this is ready to go. Just rebase master? Anything you see you change?

dopplershift commented 8 years ago

Just a few inline comments. Squash down the commits if you like, just to capture the individual steps you want in the history. Otherwise, good to go!

jrleeman commented 8 years ago

Ok. I made another branch to play with squashing down the commits, but didn't get it to work right. What's the right procedure to squash them without replaying them directly on master?

dopplershift commented 8 years ago

I usually use: git rebase -i master [yourbranchhere]

jrleeman commented 8 years ago

Ok. Also, Tavis is dying, but I think it's on the conda/travis side?

The command "conda update --yes conda" failed and exited with 127 during .

dopplershift commented 8 years ago

Looks like conda install for python 2 changed. See:

PREFIX=/home/travis/miniconda2

and

$ export PATH=/home/travis/miniconda/bin:$PATH
jrleeman commented 8 years ago

1) I'll have to force the push of my rebase right?

2) So what's the best approach for the travis,yml? We'll have to set something for python 2 and 3 right?

dopplershift commented 8 years ago

1) Yes, push --force. Might want to do a --dry-run (?) to double check what branches are being pushed.

2) When installing miniconda, specify where to install it, $HOME/miniconda maybe. The commandline flag escapes me right now.

jrleeman commented 8 years ago

Woohoo! Think we can merge this thing?

dopplershift commented 8 years ago

Depends...do you like that last commit message? Otherwise, yes.

jrleeman commented 8 years ago

Won't the squashed commit messages come along too? Sorry, still figuring out how to keep a clean-ish log

dopplershift commented 8 years ago

When you rebase squash, you can edit the commit message to contain what you want. You can also use fixup and squash a commit and throw away its message.

Ryan

On Nov 4, 2015, at 18:38, John Leeman notifications@github.com wrote:

Won't the squashed commit messages come along too? Sorry, still figuring out how to keep a clean-ish log

— Reply to this email directly or view it on GitHub.

jrleeman commented 8 years ago

I didn't even notice it had actually inserted my $HOME variable. Anyway, message edited. Merge away if you're happy as well.