Skip to content

consolidate package info files#2808

Merged
orbeckst merged 2 commits intodevelopfrom
update-pypi-SUMMARY
Jul 14, 2020
Merged

consolidate package info files#2808
orbeckst merged 2 commits intodevelopfrom
update-pypi-SUMMARY

Conversation

@orbeckst
Copy link
Member

@orbeckst orbeckst commented Jun 30, 2020

Fixes #2807

Changes made in this Pull Request:

  • generate LONG_DESCRIPTION from README.rst (remove SUMMARY.txt (out of date) and
    add code to setup.py to extract reST suitable for PyPi)
  • updated README.rst (links to User Guide, add sections similar to https://www.mdanalysis.org/) and
    removed raw html by including a down-scaled version of the NF logo
  • update links to website throughout
  • added Travis job to check that we can build a pypi source distribution package (sdist)
  • cleaned up MANIFEST.in

PR Checklist

  • Tests?
  • Docs?
  • CHANGELOG updated?
  • Issue raised/referenced?

@orbeckst
Copy link
Member Author

More could be done here, e.g., the README and INSTALL file duplicate content. Instead of being fancy and generating them somehow, perhaps we just reduce them to the minimum necessary and make sure that they contain helpful links?

Please contribute to the PR, not sure if I have much more time to work on it.

@codecov
Copy link

codecov bot commented Jul 1, 2020

Codecov Report

Merging #2808 into develop will increase coverage by 0.02%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #2808      +/-   ##
===========================================
+ Coverage    92.20%   92.22%   +0.02%     
===========================================
  Files          184      184              
  Lines        24103    24170      +67     
  Branches      3134     3134              
===========================================
+ Hits         22224    22291      +67     
  Misses        1814     1814              
  Partials        65       65              
Impacted Files Coverage Δ
package/MDAnalysis/__init__.py 92.50% <ø> (ø)
package/MDAnalysis/core/_get_readers.py 96.05% <ø> (ø)
package/MDAnalysis/core/universe.py 96.95% <100.00%> (ø)
util.py 88.10% <0.00%> (+0.08%) ⬆️
coordinates/base.py 94.82% <0.00%> (+0.28%) ⬆️
auxiliary/base.py 91.31% <0.00%> (+0.56%) ⬆️

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 d266b0b...bbc3dcb. Read the comment docs.

@orbeckst orbeckst force-pushed the update-pypi-SUMMARY branch 3 times, most recently from 93ef8cf to cf27760 Compare July 3, 2020 19:47
@orbeckst orbeckst requested review from IAlibay, RMeli, lilyminium and richardjgowers and removed request for IAlibay July 6, 2020 23:41
Copy link
Member

@IAlibay IAlibay left a comment

Choose a reason for hiding this comment

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

Just a couple of questions, main one being that the logo doesn't seem to be centered in: https://github.com/MDAnalysis/mdanalysis/tree/update-pypi-SUMMARY

@pep8speaks
Copy link

pep8speaks commented Jul 7, 2020

Hello @orbeckst! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2020-07-13 23:27:30 UTC

@orbeckst
Copy link
Member Author

orbeckst commented Jul 7, 2020

Btw, thanks for reviewing @IAlibay ... I had removed you from the initial list as I didn't want to pile even more on you. So thank you for doing it nevertheless.

@orbeckst
Copy link
Member Author

@IAlibay do you think that anything else needs changing here?

Copy link
Member

@IAlibay IAlibay left a comment

Choose a reason for hiding this comment

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

lgtm, just a few minor comments to possibly consider.

README.rst Outdated
.. _`MDAnalysis.analysis`: https://docs.mdanalysis.org/documentation_pages/analysis_modules.html
.. _`tutorials`: https://www.mdanalysis.org/pages/learning_MDAnalysis/
.. _`guide`: https://github.com/MDAnalysis/mdanalysis/wiki/Guide-for-Developers
.. _`tutorials`: https://www.mdanalysis.org/UserGuide/examples/README.html
Copy link
Member

Choose a reason for hiding this comment

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

I realise it points in the same place, but for consistency should this be: https://userguide.mdanalysis.org/1.0.0/examples/README.html instead?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, thanks, or rather https://userguide.mdanalysis.org/examples/README.html (so that we don't have to update the version info)

flags=re.DOTALL)
assert m, "README.rst does not contain a level-1 heading"
return buffer[m.end():]

Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't there be two blank lines here? I would have expected pep8speaks to pick this one up, so maybe there's a PEP8 special case for empty lines between functions and if __name__ == '__main__' that I'm not aware of.

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed (together with other PEP8 complaints)

orbeckst and others added 2 commits July 13, 2020 16:20
- generate LONG_DESCRIPTION from README.rst
  - remove SUMMARY.txt (out of date)
  - read top-level repository README.rst for LONG_DESCRIPTION
- changed README.rst
  - add installation instruction (link)
  - add links to Quickstart Guide, User Guide, and API docs
  - add links to issue tracker and mailing list in text (Contributing)
  - replaced links to wiki with links to User Guide
  - remove raw html from README (raw html not allowed on PyPi)
  - replace NumFOCUS logo image with reduced size version (200 x 61 px) and standard reST
    image syntax (logo added to web site in commit
    MDAnalysis/MDAnalysis.github.io@ec4fe2c )
  - fix broken link
  - tutorials direct to Examples in User Guide
  - add link to video section of "Learning MDAnalysis"
  - passes `twine check`
- cleaned up MANIFEST.in (for pypi packages)
- fixed links in Py files
  - Make sure that we always use the SSL url of the home page

      git grep -l 'http://www\.mdanalysis\.org' | xargs perl -wpi~ -e 's(https://www\.mdanalysis\.org)(https://www.mdanalysis.org)'

  - fixed link to issue tracker in files

      git grep -l 'issues.mdanalysis.org' | xargs perl -wpi~ -e 's(https?://issues\.mdanalysis\.org)(https://github.com/MDAnalysis/mdanalysis/issues)

  - fixed PEP8 issues in files

- various updates in testsuite/README (link to userguide, update badges)
- use User Guide as style reference

Co-authored-by: Lily Wang <31115101+lilyminium@users.noreply.github.com>
- explicit PYPI_CHECK in script section
- switch travis to beta for config validation
  - https://docs.travis-ci.com/user/build-config-validation
  - get feedback on problems with the config yml file

Note: Use ci-helper's algorithm for installing numpy and don't pin a numpy version,
      not even for the simple PYPI_CHECK section
@orbeckst orbeckst force-pushed the update-pypi-SUMMARY branch from 0b0d4c2 to bbc3dcb Compare July 13, 2020 23:27
@orbeckst
Copy link
Member Author

orbeckst commented Jul 13, 2020

I rewrote the history to cleanly separate the meta data updates and the addition of a the package build check in Travis CI. (EDIT) so that this can be merged.

@orbeckst orbeckst merged commit 75706b4 into develop Jul 14, 2020
@orbeckst orbeckst deleted the update-pypi-SUMMARY branch July 14, 2020 06:30
This was referenced Jul 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

package info files are not up-to-date

6 participants