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 packaging & switch to versioningit #74

Merged
merged 10 commits into from
Dec 23, 2023
Merged

Update packaging & switch to versioningit #74

merged 10 commits into from
Dec 23, 2023

Conversation

IAlibay
Copy link
Member

@IAlibay IAlibay commented Nov 5, 2023

Fixes #73

Copy link

codecov bot commented Nov 5, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (8498b14) 99.74% compared to head (2a8ccd6) 99.73%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master      #74      +/-   ##
==========================================
- Coverage   99.74%   99.73%   -0.01%     
==========================================
  Files           5        5              
  Lines         385      383       -2     
==========================================
- Hits          384      382       -2     
  Misses          1        1              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@pep8speaks
Copy link

pep8speaks commented Nov 5, 2023

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

Line 1:1: W391 blank line at end of file

Line 1:1: W391 blank line at end of file

Line 28:23: E222 multiple spaces after operator
Line 29:25: E222 multiple spaces after operator
Line 31:25: E222 multiple spaces after operator
Line 32:29: E222 multiple spaces after operator
Line 33:31: E222 multiple spaces after operator
Line 35:26: E222 multiple spaces after operator
Line 36:30: E222 multiple spaces after operator
Line 37:32: E222 multiple spaces after operator
Line 39:26: E222 multiple spaces after operator
Line 40:30: E222 multiple spaces after operator
Line 41:32: E222 multiple spaces after operator
Line 46:22: E222 multiple spaces after operator
Line 47:26: E222 multiple spaces after operator
Line 48:28: E222 multiple spaces after operator
Line 53:29: E222 multiple spaces after operator
Line 54:33: E222 multiple spaces after operator
Line 55:35: E222 multiple spaces after operator
Line 62:22: E222 multiple spaces after operator
Line 63:26: E222 multiple spaces after operator
Line 64:28: E222 multiple spaces after operator
Line 65:29: E222 multiple spaces after operator
Line 66:33: E222 multiple spaces after operator
Line 67:35: E222 multiple spaces after operator
Line 74:22: E222 multiple spaces after operator
Line 75:26: E222 multiple spaces after operator
Line 76:28: E222 multiple spaces after operator
Line 77:29: E222 multiple spaces after operator
Line 78:33: E222 multiple spaces after operator
Line 79:35: E222 multiple spaces after operator
Line 86:22: E222 multiple spaces after operator
Line 87:26: E222 multiple spaces after operator
Line 88:28: E222 multiple spaces after operator
Line 89:29: E222 multiple spaces after operator
Line 90:33: E222 multiple spaces after operator
Line 91:35: E222 multiple spaces after operator
Line 112:33: E222 multiple spaces after operator
Line 113:80: E501 line too long (81 > 79 characters)
Line 114:80: E501 line too long (81 > 79 characters)
Line 115:32: E222 multiple spaces after operator
Line 116:47: E222 multiple spaces after operator
Line 116:80: E501 line too long (94 > 79 characters)
Line 117:41: E222 multiple spaces after operator
Line 117:80: E501 line too long (82 > 79 characters)
Line 118:46: E222 multiple spaces after operator
Line 118:80: E501 line too long (92 > 79 characters)
Line 119:47: E222 multiple spaces after operator
Line 119:80: E501 line too long (94 > 79 characters)
Line 120:46: E222 multiple spaces after operator
Line 120:80: E501 line too long (92 > 79 characters)
Line 121:43: E222 multiple spaces after operator
Line 121:80: E501 line too long (86 > 79 characters)
Line 122:42: E222 multiple spaces after operator
Line 122:80: E501 line too long (84 > 79 characters)

Comment last updated at 2023-12-23 14:35:15 UTC

@IAlibay IAlibay changed the title [WIP] Update packaging & switch to versioningit Update packaging & switch to versioningit Nov 5, 2023
@IAlibay
Copy link
Member Author

IAlibay commented Nov 5, 2023

@fiona-naughton this would be a good one for pair review - it's a rather odd packaging setup so it might end up being quite informative.

Copy link

@mattwthompson mattwthompson left a comment

Choose a reason for hiding this comment

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

If feedback from a passerby is welcome, seems good to me. I have a couple selfish curiosities, no criticisms or suggested improvements though

@@ -16,7 +16,7 @@ concurrency:

defaults:
run:
shell: bash -l {0}

Choose a reason for hiding this comment

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

Just curious why this is no longer necessary? It's bit magical to me but I often ran into problems without it

Copy link
Member Author

Choose a reason for hiding this comment

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

I thought I had written some answer here - sorry about the delay. The answer is that we're using setup-python that happens to be quite sensitive to login shells on macOS (compared to mamba which in my experience is sensitive to non-login shells 😓 ). So you end up needing a pure bash shell, otherwise it'll pick up system python in subsequent parts of the workflow.

which pip
conda info
conda list
pip install pytest pytest-xdist pytest-cov codecov

Choose a reason for hiding this comment

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

Very minor - if you using CodeCov's official-ish action, I don't think you need to install their Python package

Copy link
Member Author

Choose a reason for hiding this comment

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

thanks!

EDR_IRREG = resource_filename(__name__, 'data/irregular.edr')
EDR_IRREG_XVG = resource_filename(__name__, 'data/irregular.xvg')
EDR_IRREG_UNITS = resource_filename(__name__, 'data/irregular_units.p')
EDR = (_data_ref / 'cat_small.edr').as_posix()

Choose a reason for hiding this comment

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

Purely out of curiousity, would

Suggested change
EDR = (_data_ref / 'cat_small.edr').as_posix()
EDR = str(_data_ref / 'cat_small.edr')

not wort for Windows-y reasons?

Copy link
Member Author

Choose a reason for hiding this comment

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

If I remember correctly as_posix just returns str + a slahes replacement. I think I'm mostly being overly cautious - I suspect it would work fine either way.

@IAlibay
Copy link
Member Author

IAlibay commented Dec 23, 2023

Thanks for the review @mattwthompson !

@IAlibay IAlibay merged commit e5af59e into master Dec 23, 2023
8 checks passed
@IAlibay IAlibay deleted the update-packaging branch December 23, 2023 14:41
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.

LGPLv2.1 license does not work with Apache 2.0 dependency (pbr)
3 participants