Skip to content

Fix ruamel.yaml version#720

Merged
jmchilton merged 1 commit intogalaxyproject:masterfrom
mvdbeek:pin_ruamel
Sep 6, 2017
Merged

Fix ruamel.yaml version#720
jmchilton merged 1 commit intogalaxyproject:masterfrom
mvdbeek:pin_ruamel

Conversation

@mvdbeek
Copy link
Member

@mvdbeek mvdbeek commented Sep 6, 2017

This should fix #719.

@jmchilton
Copy link
Member

Cool - thanks @mvdbeek - I'll work on getting a release out with this in it.

@jmchilton jmchilton merged commit 68266cd into galaxyproject:master Sep 6, 2017
@nsoranzo
Copy link
Member

nsoranzo commented Sep 6, 2017

Shouldn't that be fixed upstream in cwltool?

@jmchilton
Copy link
Member

@nsoranzo I imagine it was but we have a fixed older version of cwltool as a dependency, I'll remove this line when I merge my cwltool update as part of #714. Does that sound like the right approach?

@jmchilton
Copy link
Member

@nsoranzo
Copy link
Member

nsoranzo commented Sep 6, 2017

Perfect, thanks @jmchilton!

@jmchilton
Copy link
Member

@nsoranzo Cool - thanks! I've made that change in #714 and rebased it as d2ea830.

I'm going to see what the tests say about #723 and if things look okay I think I will do a release so this is fixed and Conda is fixed as well. Then I will merge #714 later this week (or maybe later today) and create a new set of problems.

@jmchilton
Copy link
Member

Well so things went sideways because the new galaxy-lib introduced test errors (these can be seen in #723 but would be experienced in the wild anyway since we don't pin an upper bound on galaxy-lib). So I just cleaned up and merged my CWL WIP with 2462099 and did a release so either the dependencies are fixed when coming from PyPI ... hopefully ... but probably not and we shall see.

@nsoranzo
Copy link
Member

nsoranzo commented Sep 6, 2017

@jmchilton I couldn't see any new test error in https://travis-ci.org/galaxyproject/planemo/jobs/272496388:

Am I missing something?

@jmchilton
Copy link
Member

jmchilton commented Sep 6, 2017

I just hadn't seen the jobloaderctx error previously - my 👀 aren't 🦅 (they call me 💩👀). I didn't think it would have occurred with older galaxy-libs before the two I released today.

@nsoranzo
Copy link
Member

nsoranzo commented Sep 6, 2017

jobloaderctx error is a side-effect of pinning ruamel.yaml in this very PR, in fact it started with https://travis-ci.org/galaxyproject/planemo/jobs/272481174

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.

dependency conflicts cause scripts/test_conformance_cwl.bash to fail

3 participants