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

fix: do not overwrite default resources setting in azure batch executor #2395

Merged
merged 1 commit into from Aug 5, 2023

Conversation

johanneskoester
Copy link
Contributor

Description

QC

  • The PR contains a test case for the changes or the changes are already covered by an existing test case.
  • The documentation (docs/) is updated to reflect the changes or this is not necessary (e.g. if the change does neither modify the language nor the behavior or functionalities of Snakemake).

@sonarcloud
Copy link

sonarcloud bot commented Aug 4, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

Copy link
Contributor

@jakevc jakevc left a comment

Choose a reason for hiding this comment

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

👍

@johanneskoester johanneskoester merged commit 4aef3b9 into main Aug 5, 2023
7 checks passed
@johanneskoester johanneskoester deleted the fix/azbatch-default-resources branch August 5, 2023 08:30
johanneskoester pushed a commit that referenced this pull request Aug 5, 2023
🤖 I have created a release *beep* *boop*
---


##
[7.32.1](v7.32.0...v7.32.1)
(2023-08-05)


### Bug Fixes

* add missing spaces between lines that get concatenated.
([#2268](#2268))
([7238458](7238458))
* better message about profile usage upon execution
([#2391](#2391))
([cf8aea5](cf8aea5))
* do not overwrite default resources setting in azure batch executor
([#2395](#2395))
([4aef3b9](4aef3b9))
* updating of non-dict config values gives error
([#2364](#2364))
([b33aeec](b33aeec))
* wrong rule names when nesting module imports
([#1817](#1817))
([65c79a4](65c79a4))


### Documentation

* basics.rst: suggest VS Code instead of deprecated Atom as IDE
([#2368](#2368))
([1357316](1357316))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
johanneskoester pushed a commit that referenced this pull request Aug 7, 2023
### Description

- Removes unnecessary setting of Snakefile in AzBatch executor. This was
1. not necessary, and 2. was causing a failure to resolve the Snakefile
path when it was located at `workflow/Snakefile`.
- Since default resources is now included in the command per #2395 , I
needed to update the shell quoting so the command doesn't fail because
of the parentheses in the default resources. Used the same solution as
#2043 and it works nicely.
- Updated the masking regex to be more generic for SAS token
possibilities

### QC

<!-- Make sure that you can tick the boxes below. -->

* [x] The PR contains a test case for the changes or the changes are
already covered by an existing test case.
* [x] The documentation (`docs/`) is updated to reflect the changes or
this is not necessary (e.g. if the change does neither modify the
language nor the behavior or functionalities of Snakemake).
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.

None yet

2 participants