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

Generic escape #625

Merged
merged 6 commits into from
Nov 4, 2020
Merged

Generic escape #625

merged 6 commits into from
Nov 4, 2020

Conversation

rneher
Copy link
Member

@rneher rneher commented Nov 3, 2020

Description of proposed changes

Make the way we delimit special characters for iq tree more generic.

Thank you for contributing to Nextstrain!

@rneher rneher requested a review from huddlej November 3, 2020 09:41
@rneher
Copy link
Member Author

rneher commented Nov 3, 2020

@huddlej this could certainly be made more pretty, but otherwise pretty straightforward.

@codecov
Copy link

codecov bot commented Nov 3, 2020

Codecov Report

Merging #625 into master will decrease coverage by 0.05%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #625      +/-   ##
==========================================
- Coverage   28.59%   28.53%   -0.06%     
==========================================
  Files          39       39              
  Lines        5355     5365      +10     
  Branches     1314     1319       +5     
==========================================
  Hits         1531     1531              
- Misses       3768     3778      +10     
  Partials       56       56              
Impacted Files Coverage Δ
augur/tree.py 9.17% <0.00%> (-0.47%) ⬇️

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 14cf020...f2c98b5. Read the comment docs.

Copy link
Contributor

@huddlej huddlej left a comment

Choose a reason for hiding this comment

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

This worked for me! I have a couple of clarifying questions inline and also found that we don't need the Snakemake version constraint anymore.

augur/tree.py Show resolved Hide resolved
augur/tree.py Show resolved Hide resolved
augur/tree.py Outdated Show resolved Hide resolved
@@ -71,7 +71,7 @@
"pytest-cov >=2.8.1, ==2.8.*",
"pytest-mock >= 2.0.0, ==2.0.*",
"recommonmark >=0.5.0, ==0.*",
"snakemake >=5.4.0, ==5.*",
"snakemake >=5.4.0, <5.27",
Copy link
Contributor

Choose a reason for hiding this comment

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

We shouldn't need this additional constraint anymore. They changed the minimum required version of Snakemake back to 3.5 in the release they made today (5.27.4). This should fix the error Travis CI originally encountered.

Copy link
Member Author

Choose a reason for hiding this comment

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

ok!

Copy link
Contributor

Choose a reason for hiding this comment

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

Darn, it looks like there are still bugs with version <3.7 and the newest Snakemake. There is an issue open for the specific error we see in CI, but the easiest fix for us is the original constraint you had here. Sorry about that!

rneher and others added 2 commits November 4, 2020 09:33
Snakemake's recent releases (v5.27.*) broke compatibility with Python
<3.7. We have to use an earlier version of Snakemake since we still use
Python 3.6 in CI.
@huddlej
Copy link
Contributor

huddlej commented Nov 4, 2020

@rneher I reverted back to the Snakemake version constraint you originally had and the CI builds pass. This is interesting though, because our CI builds for Python 3.7 and 3.8 should have passed. I see now that we use Python 3.6 in the conda environment no matter what the CI's Python version is. I'll make an issue for this today, since that is a bug on our side.

@huddlej huddlej merged commit 5a712db into master Nov 4, 2020
@huddlej huddlej deleted the generic_escape branch November 4, 2020 15:41
@huddlej huddlej added this to the Next release 10.x.x milestone Nov 4, 2020
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.

2 participants