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

[MRG] backport github actions to stable branch (3.5.x) #1317

Merged
merged 17 commits into from
Feb 15, 2021
Merged

Conversation

ctb
Copy link
Contributor

@ctb ctb commented Feb 9, 2021

This backports GitHub Actions and associated test stuff from #1244 #1249 #1252 #696 #1295 over to the stable branch, mostly to support releases along 3.5.x.

Checklist

  • Is it mergeable?
  • make test Did it pass the tests?
  • make coverage Is the new code covered?
  • Did it change the command-line interface? Only additions are allowed
    without a major version increment. Changing file formats also requires a
    major version number increment.
  • Was a spellchecker run on the source code and documentation after
    changes were made?

@ctb ctb changed the base branch from latest to stable February 9, 2021 22:36
@ctb
Copy link
Contributor Author

ctb commented Feb 9, 2021

this appears to be working? but now I would need to re-enable python 2.7...

@ctb
Copy link
Contributor Author

ctb commented Feb 10, 2021

ok, now looks like tox needs to be configured to actually run tests :)

@ctb
Copy link
Contributor Author

ctb commented Feb 13, 2021

...how weird, this is running on an incorrect git ref? https://github.com/dib-lab/sourmash/runs/1893907938?check_suite_focus=true

@ctb ctb changed the title [WIP] try backporting github actions to stable branch (3.5.x) [MRG] backport github actions to stable branch (3.5.x) Feb 14, 2021
@ctb
Copy link
Contributor Author

ctb commented Feb 14, 2021

@luizirber I think this is ready for review and merge, as the final cherry atop the whipped cream of sourmash 3.5.1. We're still having problems with pysam install on py3.8 and py3.9, but fixing them is annoying and the tests do pass on py3.7. Most importantly, the wheels build, and the wheels upload, and pip install works in a clean py3.8.6 environment (conda create -n sourmash-install-test-2 python=3.8).

FWIW, if we were to pursue pysam fixes, I would probably look into using Cython to rebuild the C files, and if that didn't work, I might want to try running inside of conda (which can install pysam just fine).

This was referenced Feb 14, 2021
setup.py Outdated
@@ -80,7 +80,7 @@ def build_native(spec):
'doc' : ['sphinx', 'myst-parser[sphinx]', 'alabaster',
"sphinxcontrib-napoleon", "nbsphinx",
"ipython"],
'10x': ['bam2fasta==1.0.4'],
'10x': ['bam2fasta==1.0.8'],
Copy link
Member

Choose a reason for hiding this comment

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

does the pysam problem goes away if we stick with 1.0.4? Since we are deprecating it, no big reason to upgrade the dep here...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it shouldn't, but heck, I'll give it a try ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

there you go - probably cleaner this way (fewer changes), but same failures!

Copy link
Member

@luizirber luizirber left a comment

Choose a reason for hiding this comment

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

I think it is too much effort to fix the 10x/bam2fasta usage, for a feature that is optional and is being deprecated. so, LGTM and let's carry on =]

@luizirber luizirber merged commit 780a743 into stable Feb 15, 2021
@luizirber luizirber deleted the add_actions_3x branch February 15, 2021 21:58
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.

None yet

2 participants