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

Suppress filenames in SAM merge using egrep #4

Merged
merged 1 commit into from
Feb 25, 2015

Conversation

peterjc
Copy link
Contributor

@peterjc peterjc commented Feb 25, 2015

Based on fix suggested by Roberto Alonso (at CIPF) on the mailing list, see:
https://lists.galaxyproject.org/pipermail/galaxy-dev/2015-February/021589.html

@nsoranzo
Copy link
Member

+1

Option "-h" is supported also on OS X: https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/egrep.1.html

I was also suggesting to Roberto to open a PR, but including also the changes to lib/galaxy/datatypes/sequence.py .

@peterjc
Copy link
Contributor Author

peterjc commented Feb 25, 2015

Fixing lib/galaxy/datatypes/sequence.py is on my TODO list if Roberto doesn't take this up.

@blankenberg
Copy link
Member

If someone is going to be looking into this anyway, it might be nice to make sure that we are using a list of arguments instead of a string when calling the external command. And also probably not use os.system.

But this change looks good to me.

blankenberg added a commit that referenced this pull request Feb 25, 2015
Suppress filenames in SAM merge using egrep
@blankenberg blankenberg merged commit 4a9cb9f into galaxyproject:dev Feb 25, 2015
@dannon
Copy link
Member

dannon commented Feb 26, 2015

This is an automated message. Thanks for your contribution, a Trello card to track this issue has been created. Apply this patch for testing.

hexylena referenced this pull request in hexylena/galaxy May 6, 2015
natefoo referenced this pull request in natefoo/galaxy May 13, 2015
jmchilton pushed a commit that referenced this pull request May 14, 2015
More IE Enhancements [WIP]
jxtx added a commit that referenced this pull request Jun 16, 2015
Fix Guru's name in CONTRIBUTORS.md
bgruening added a commit that referenced this pull request Jul 11, 2015
Resolves the merge conflict, one minor whitespace fix.
jmchilton pushed a commit that referenced this pull request Jul 14, 2015
Update docs, re-instate backwards compatability
mvdbeek pushed a commit that referenced this pull request Mar 4, 2016
Fix execution order and short-circuit issue when installing tools
dannon pushed a commit that referenced this pull request Apr 4, 2016
dannon pushed a commit that referenced this pull request May 3, 2016
jmchilton pushed a commit that referenced this pull request Jun 15, 2016
Stays up-to-date with dev of galaxy project
dannon pushed a commit that referenced this pull request Aug 15, 2016
Force update repository manager to launch postfork.
martenson pushed a commit that referenced this pull request Sep 21, 2016
propagate allowed username changes to form hints
dannon pushed a commit that referenced this pull request Jan 31, 2017
I feel that mapping from

```
- from: blast+
  to: blast
```

should be the same as

```
- from:
   name: blast+
   version: Null
  to: blast
```

since it should just be syntatic sugar. And I think that second version reads like it should by default apply to all versions.

I feel therefore it is probably better to explicitly require stating that a mapping only applies to unversioned requirements. This commit does that by introducing the syntax:

```
- from:
    name: blast+
    unversioned: true
  to:
    name: blast
    version: 1.3.4
```

It feels better to have strongly typed entities like this than to introduce magic constants such as:

```
- from:
   name: blast+
   version: __unversioned__
  to:
   name: blast
   version: 1.3.4
```

which is another route this could have gone I guess.
dannon pushed a commit that referenced this pull request Jun 14, 2017
martenson pushed a commit that referenced this pull request Jun 27, 2017
Merge just before GCC2017
martenson pushed a commit that referenced this pull request Apr 11, 2018
almahmoud referenced this pull request in almahmoud/galaxy Nov 11, 2019
mvdbeek pushed a commit that referenced this pull request Nov 15, 2021
Change anvil branche to dev
mvdbeek added a commit that referenced this pull request Aug 1, 2024
Fixes #18633:
```
ValueError: dictionary update sequence element #4 has length 1; 2 is required
  File "galaxy/tools/__init__.py", line 1969, in handle_single_execution
    rval = self.execute(
  File "galaxy/tools/__init__.py", line 2066, in execute
    return self.tool_action.execute(
  File "galaxy/tools/actions/model_operations.py", line 89, in execute
    self._produce_outputs(
  File "galaxy/tools/actions/model_operations.py", line 120, in _produce_outputs
    tool.produce_outputs(
  File "galaxy/tools/__init__.py", line 3816, in produce_outputs
    new_labels_dict = dict(source_new_label)

Exception caught while attempting to execute tool with id '__RELABEL_FROM_FILE__':
```
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.

4 participants