Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sphinx docs #71

Merged
merged 11 commits into from
Feb 3, 2021
Merged

Add sphinx docs #71

merged 11 commits into from
Feb 3, 2021

Conversation

martamatos
Copy link
Collaborator

Work in progress, just to make the discussion easier.

@martamatos martamatos self-assigned this Jan 31, 2021
doc/conf.py Outdated

project = 'yaml2sbml'
copyright = '2021'
author = 'jakob, yannik, marta, dilan, etc. [TODO]'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
author = 'jakob, yannik, marta, dilan, etc. [TODO]'
author = 'Jakob Vanhoefer, Marta R. A. Matos, Dilan Pathirana, Yannik Schälte'

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed :)

doc/index.rst Outdated
===============================================


This small package allows the user to [TODO]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will fix this

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I took the liberty of adding some text, but feel free to change it all (i just think it's easier to change something than to write from scratch) :)

@jvanhoefer jvanhoefer changed the base branch from master to develop February 2, 2021 15:35
doc/index.rst Outdated
===============================================


This small package allows the user to [TODO]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe use the README.md here?

doc/install.rst Outdated
```pip install .```


Requirements for users
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would rather not list the requirements here, as this is likely to get outdated. I.e. requirements only listed in setup.py. / requirements.txt / setup.cfg / wherever it is.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense :)
Just added a tiny instruction subsection to the main page and removed the install page.

doc/install.rst Outdated
- pandas>=1.0.1
- petab>=0.1.4

Extras (to run examples):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if not done yet, I would turn this into an "extras_require".

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should already be in there... :)

@jvanhoefer
Copy link
Member

Open points

  • Jupiter notebook
  • Intro text

@martamatos
Copy link
Collaborator Author

Just to say that i've figured out how to include jupyter notebooks and will push tonight :)

@jvanhoefer
Copy link
Member

@martamatos Then I wait for you to push, before doing "my stuff"

@martamatos martamatos marked this pull request as ready for review February 2, 2021 23:13
@martamatos
Copy link
Collaborator Author

Okidoki, i think this is ready from my side, which doesn't mean it really is ready, so feedback is super welcome, or feel free to modify things directly, whatever you prefer :)

You can see the documentation here: https://yaml2sbml.readthedocs.io/en/latest/, and it's probably a good idea to use a private window to open the link, as sometimes i can't see the latest changes in a normal window (due to cache probably).

@martamatos
Copy link
Collaborator Author

Aaaand, i accidently removed the examples folder from inside the doc folder (i thought i had put it there by mistake) :/

However, the doc folder might not be the best place to have the examples folder, since now there are a bunch of other files there too.

So my suggestion is to either put the sphinx docs in a different folder (sphinx_docs?), or put the examples folder in the main directory. Ideas?

(and yes, i know there is a conflict between the branches, which i'll fix as soon as we decide on this)

@yannikschaelte
Copy link
Member

Aaaand, i accidently removed the examples folder from inside the doc folder (i thought i had put it there by mistake) :/

However, the doc folder might not be the best place to have the examples folder, since now there are a bunch of other files there too.

So my suggestion is to either put the sphinx docs in a different folder (sphinx_docs?), or put the examples folder in the main directory. Ideas?

(and yes, i know there is a conflict between the branches, which i'll fix as soon as we decide on this)

I think examples/ in the base folder makes sense.

Copy link
Member

@yannikschaelte yannikschaelte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@jvanhoefer
Copy link
Member

I will resolve the merge conflicts and include the new notebooks, that are new in the master branch and not in the toctree yet... :)

After that, looks ready to merge for me :)

@codecov-io
Copy link

codecov-io commented Feb 3, 2021

Codecov Report

Merging #71 (f827958) into develop (1afbc73) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop      #71   +/-   ##
========================================
  Coverage    77.69%   77.69%           
========================================
  Files            4        4           
  Lines          426      426           
========================================
  Hits           331      331           
  Misses          95       95           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1afbc73...f827958. Read the comment docs.

@jvanhoefer jvanhoefer merged commit 9563a47 into develop Feb 3, 2021
@jvanhoefer jvanhoefer deleted the add_sphinx_docs branch February 3, 2021 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants