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

pull data from https instead of fauna #3

Merged
merged 1 commit into from
Apr 1, 2022
Merged

pull data from https instead of fauna #3

merged 1 commit into from
Apr 1, 2022

Conversation

j23414
Copy link
Contributor

@j23414 j23414 commented Mar 25, 2022

Description of proposed changes

To match the zika workflow, pull data from https instead of fauna (rethinkdb).

Related issue(s)

Related to pull nextstrain/zika#15

Testing

To test the full pipeline:

cd measles
nextstrain build . 

To test the smaller test dataset

cd measles
mkdir -p data
cp -v example_data/* data/.
nextstrain build . 

.travis.yml Outdated Show resolved Hide resolved
Copy link
Member

@victorlin victorlin left a comment

Choose a reason for hiding this comment

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

Looks good! Would be good to clean up the git commit history with a rebase, or in the past I've used the squash and merge option on GitHub (but I don't think anyone else on the team prefers it). Let me know if you need help.

Co-authored-by: Victor Lin <13424970+victorlin@users.noreply.github.com>
@j23414 j23414 closed this Apr 1, 2022
@j23414
Copy link
Contributor Author

j23414 commented Apr 1, 2022

hmm, I might not have "merge" permissions for nextstrain/measles. Anyone else willing to merge?

@j23414 j23414 reopened this Apr 1, 2022
@victorlin
Copy link
Member

@j23414 I just added @nextstrain/core as a writer to this repo so you should be able to do so now.

@j23414 j23414 merged commit d877cac into nextstrain:master Apr 1, 2022
Comment on lines -10 to 26
- pip3 install git+https://github.com/nextstrain/cli
# https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/use-conda-with-travis-ci.html#the-travis-yml-file
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
- bash miniconda.sh -b -p $HOME/miniconda
- source "$HOME/miniconda/etc/profile.d/conda.sh"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
# Useful for debugging any issues with conda
- conda info -a
# Install nextstrain cli
- conda install -n base -c conda-forge mamba --yes
- conda activate base
- mamba create -n nextstrain -c conda-forge -c bioconda nextstrain-cli augur auspice nextalign snakemake git --yes
- conda activate nextstrain
- nextstrain version
- nextstrain check-setup
- nextstrain update
Copy link
Member

Choose a reason for hiding this comment

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

This diff seems like a step in the wrong direction to me. What was a single line turned into 14. :-/ There's also a lot of unnecessary stuff installed (since Docker is supported and what's used here), like augur, auspice, nextalign, etc. This feels like it was copy/pasted from elsewhere (where maybe it was all necessary, maybe not) without adjusting it for the new context, which is a recipe for degrading the codebase quality over time.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

From a "code smell" standpoint I agree with you @tsibley. The current expansion was a workaround until pip3 install was fixed for .travis testing.

See nextstrain/zika#14 for more details. Open other suggestions.

Copy link
Member

Choose a reason for hiding this comment

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

Suggestions:

  1. Move to GitHub Actions where we're using conda-incubator/setup-miniconda@v2 in repos like augur
  2. Only do mamba install nextstrain-cli
  3. Make it more clear that Docker is being used. Maybe nextstrain check-setup --set-default? Unless there is a way to do something like nextstrain --set-runtime docker

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I like option 1, to move toward a consistent CI across repos :)

Copy link
Member

Choose a reason for hiding this comment

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

Ah, I didn't see nextstrain/zika#14. That's useful context.

I don't care too much about specifically conda/mamba vs. pip and Travis CI vs. GitHub Actions here, but good to be consistent when it makes sense (e.g. prefer GitHub Actions over Travis CI) and trim things down to minimal necessary steps.

Specifically here, I would wonder why did pip install start failing? Does it work now (i.e. was it transient)? It should work, and it's the simplest step (can be installed from latest PyPI release, doesn't have to be git and probably shouldn't be).

Copy link
Member

Choose a reason for hiding this comment

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

Make it more clear that Docker is being used

I think adding the --docker flag to the nextstrain build invocation would suffice ± a comment.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Lol, I think we were both taxing .travis test at the same time.

As long as it's working now, I'm happy

@j23414 j23414 self-assigned this Apr 1, 2022
tsibley added a commit to nextstrain/zika that referenced this pull request Apr 1, 2022
We've been slowly moving everything off Travis CI in favor of
centralizing on GitHub.  More acutely motivated here by some
Travis-specific errors, previously worked around by
<#14>.

Reverts back to a simple pip install instead of conda/mamba setup as
much of it was unnecessary.  See discussion in
<nextstrain/measles#3 (comment)>.
tsibley added a commit to nextstrain/zika that referenced this pull request Apr 1, 2022
We've been slowly moving everything off Travis CI in favor of
centralizing on GitHub.  More acutely motivated here by some
Travis-specific errors, previously worked around by
<#14>.

Reverts back to a simple pip install instead of conda/mamba setup as
much of it was unnecessary.  See discussion in
<nextstrain/measles#3 (comment)>.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

3 participants