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

Update documentation #141

Merged
merged 8 commits into from
Feb 21, 2024
Merged

Update documentation #141

merged 8 commits into from
Feb 21, 2024

Conversation

schmoelder
Copy link
Contributor

@schmoelder schmoelder commented Jul 27, 2023

  • Add backlinks in documentation from parameters to model
  • Consistent binding model order in documentation
  • Consistent model/config tags in documentation
  • Fix inline issue in documentation
  • Update badges for README
  • Add citing section to README
  • Update copyright to 2023 (@sleweke how is that currently done?)

@schmoelder
Copy link
Contributor Author

@sleweke Do you know why appveyor is still trying to build CADET?

@schmoelder schmoelder force-pushed the feature/add_backlinks_in_doc branch from cf90fcc to 364783e Compare July 27, 2023 10:55
@schmoelder
Copy link
Contributor Author

I'm not opposed to having the "Citing" section in the README but I just wanted to comment that at some point @lieres and I had decided to leave the Github REAMDE as clean as possible and move all relevant information to the website where we already have a citing section. Background was that we didn't want to clutter information everywhere and instead have a single point of entry for CADET (i.e. cadet.github.io).

For comparison, the CADET-Process Github page and entry on readthedocs are identical (which I also like).

@jbreue16
Copy link
Contributor

Makes sense to me, maybe we should just edit the citing section on the website. On the other hand, things may have changed now that we have the zenodo doi linked in the github readme.

@lieres
Copy link
Member

lieres commented Jul 27, 2023

Having identical content will not be possible for CADET-Core and cadet.github.io, as the latter serves as central landing page for the whole CADET multiverse. Hence, it might be useful to copy some but not all information, and I think citing section is important.

@schmoelder
Copy link
Contributor Author

Having identical content will not be possible for CADET-Core and cadet.github.io, as the latter serves as central landing page for the whole CADET multiverse. Hence, it might be useful to copy some but not all information, and I think citing section is important.

I agree, but that was also the reason why removed the citing section (311d626) from this page to focus on code-releated things and and instead refer to https://cadet.github.io

I'm fine if we reinstate it here. Just wanted to mention it.

README.rst Outdated
@@ -31,6 +34,25 @@ Optionally, use `mamba <https://github.com/mamba-org/mamba>`_ which uses a faste

`Additional information <https://cadet.github.io/master/getting_started/installation>`_ and a `tutorial <https://cadet.github.io/master/getting_started/tutorials/breakthrough>`_ are available to guide you through the installation and the first steps of using CADET.

Citing
------------
The development of CADET has been a remarkable collaborative effort, with multiple dedicated individuals contributing their expertise to create a powerful and versatile open-source software tool. Countless hours of hard work and innovation have been invested to provide the scientific community with a valuable resource for chromatography analysis and design. As an open-source project, CADET relies on the support and recognition from users and researchers to thrive. Therefore, we kindly request that any publications, research, or work leveraging the capabilities of CADET acknowledge its creators and their seminal contributions by citing a relevant subset of the following publications.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

please write every sentence on a single line

README.rst Outdated

- **Püttmann, A.; Schnittert, S.; Naumann, U.; von Lieres, E.: Fast and accurate parameter sensitivities for the general rate model of column liquid chromatography**, Computers and Chemical Engineering 56,13 (2013), 46-57. `DOI: 10.1016/j.compchemeng.2013.04.021 <https://doi.org/10.1016/j.compchemeng.2013.04.021>`_

Additionally, we recommend citing the zenodo doi for the specific release that you used in your work to ensure reproducibility.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

clarify usage of Zenodo DOI vs other publications

@schmoelder
Copy link
Contributor Author

schmoelder commented Feb 20, 2024

This is almost ready to merge. However, documentation seems to be breaking currently. I suspect m2r. If I remember correctly, @ronald-jaepel added this. However, it does not seem to be maintained any more (https://github.com/miyakogi/m2r).

Also, @sleweke, updating the copyright I had to touch 358 files. To keep sanity, I used sed for this purpose but is there another way to do that? Do we really need that copyright notice in every file or is it enough to have one central location for it?

@ronald-jaepel
Copy link
Collaborator

ronald-jaepel commented Feb 20, 2024

I can't reproduce the error locally, but based on the error we get here, I don't think it's m2r.

Extension error:
Could not import extension sphinxcontrib.bibtex (exception: No module named 'pkg_resources')
Traceback (most recent call last):
  File "/opt/hostedtoolcache/Python/3.12.2/x64/bin/sphinx-multiversion", line 8, in <module>
    sys.exit(main())
             ^^^^^^
  File "/opt/hostedtoolcache/Python/3.12.2/x64/lib/python3.12/site-packages/sphinx_multiversion/main.py", line 338, in main
    subprocess.check_call(cmd, cwd=current_cwd)
  File "/opt/hostedtoolcache/Python/3.12.2/x64/lib/python3.12/subprocess.py", line 413, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '('/opt/hostedtoolcache/Python/3.12.2/x64/bin/python', '-R', '-m', 'sphinx', '-D', 'smv_metadata_path=/tmp/tmpw2okj78f/versions.json', '-D', 'smv_latest_version=v4.4.0', '-D', 'smv_current_version=master', '-c', '/home/runner/work/CADET-Website/CADET-Website/CADET/doc', '/tmp/tmpw2okj78f/0fcdbbf017b99712287c435cb4006cef85e11b8e/doc', '/home/runner/work/CADET-Website/CADET-Website/build/master')' returned non-zero exit status 2.

Google turned up this for

"no module named 'pkg-resources'"

which suggests that the fault may lie in a missing/outdated installation of setuptools, so I've added that to the 'requirements.txt' to test if that helps at all.

@ronald-jaepel
Copy link
Collaborator

ronald-jaepel commented Feb 20, 2024

¯_(ツ)_/¯ I don't know why, but putting setuptools into the requirements.txt doesn't actually install setuptools. Adding pip install setuptools to the workflow file does and fixes the error. ᓚᘏᗢ

Docs build now

@schmoelder schmoelder merged commit de5fd22 into master Feb 21, 2024
3 checks passed
@sleweke-bayer
Copy link
Contributor

To keep sanity, I used sed for this purpose but is there another way to do that?

I don't think there is another way.

Do we really need that copyright notice in every file or is it enough to have one central location for it?

As far as I know, we do not need the years in the copyright statement. For example, curl recently removed them: https://daniel.haxx.se/blog/2023/01/08/copyright-without-years/
So my proposal is to just get rid of the years in the copyright statement. This would avoid changing them every year.

@schmoelder schmoelder mentioned this pull request Aug 20, 2024
2 tasks
@schmoelder schmoelder deleted the feature/add_backlinks_in_doc branch August 20, 2024 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants