Skip to content

Remove Galaxy egg code#85

Merged
jmchilton merged 4 commits intogalaxyproject:masterfrom
natefoo:smash-eggs
Oct 30, 2015
Merged

Remove Galaxy egg code#85
jmchilton merged 4 commits intogalaxyproject:masterfrom
natefoo:smash-eggs

Conversation

@natefoo
Copy link
Member

@natefoo natefoo commented Sep 21, 2015

Do not merge until galaxy #428 is merged (and WIP is removed from this PR). The Pulsar side of the cleaning is incomplete.

@jmchilton
Copy link
Member

Can we just merge this now?

@natefoo
Copy link
Member Author

natefoo commented Oct 27, 2015

No, but maybe if I get some time later today I can finish it.

@natefoo
Copy link
Member Author

natefoo commented Oct 27, 2015

@jmchilton Is there anything special I should do wrt. updating the Galaxy lib? I could just remove the eggs stuff, but it feels more correct to just copy the relevant things directly from Galaxy so they are the latest versions, but obviously you must have done that with modifications to wrap the eggs imports in the past.

@natefoo
Copy link
Member Author

natefoo commented Oct 27, 2015

One other thing... would $GALAXY_HOME even be necessary for anything going forward if we:

  1. Included Galaxy's galaxy_ext module in Pulsar
  2. Documented how to specify a venv to use for running tools
  3. Documented which tools shipped with Galaxy depend on things in that venv - @nsoranzo's work in Remove remaining references to galaxy.eggs . flake8 some tools. galaxy#990 should make this easy

@jmchilton
Copy link
Member

GALAXY_HOME necessary because metadata depends on models and datatypes.

There is a script for synchronizing - see update_galaxy_client.sh and update_galaxy_utils.sh in PULSAR_ROOT.

@natefoo
Copy link
Member Author

natefoo commented Oct 28, 2015

update_galaxy_utils.sh pulls $GALAXY/lib/galaxy/job/runners/util into $PULSAR/pulsar/managers/util, but the Pulsar copy has modifications that Galaxy does not have. Should Pulsar be the canonical source for this, or Galaxy?

I can correct it (which will just mean merging them) but just wanted to know. Perhaps a README in the downstream directory indicating that changes need to be made upstream and then synchronized would be a good idea.

@natefoo
Copy link
Member Author

natefoo commented Oct 29, 2015

@jmchilton

Galaxy seems to be missing things that Pulsar has that came from Planemo?:

  • $PULSAR/galaxy/tools/linters/stdio.py
  • $PULSAR/galaxy/tools/linters/xml_order.py
  • $PULSAR/galaxy/tools/linters/xsd_util.py

Should these be synchronized Planemo -> Galaxy -> Pulsar? Any others like this I need to watch out for?

Copy link
Member

Choose a reason for hiding this comment

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

Probably this should be reverted and Pulsar version merged to Galaxy, this was last changed in commit e97a95a .

Copy link
Member Author

Choose a reason for hiding this comment

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

As always, good catch, thanks @nsoranzo

@jmchilton jmchilton merged commit 38045f6 into galaxyproject:master Oct 30, 2015
@jmchilton
Copy link
Member

Merged with @nsoranzo two fixes.

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.

3 participants