-
Notifications
You must be signed in to change notification settings - Fork 53
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
Add handling for ROSE_PYTHONPATH #2736
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
5bfea9d
add handling for ROSE_PYTHONPATH
wxtim ec8d188
Update metomi/rose/rose.py
wxtim f390352
Apply suggestions from code review
wxtim a8acbc5
fix changelog
wxtim 2407150
Update CHANGES.md
wxtim 6c7438b
Update metomi/rose/rose.py
wxtim File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
# Copyright (C) British Crown (Met Office) & Contributors. | ||
# | ||
# This file is part of Rose, a framework for meteorological suites. | ||
# | ||
# Rose is free software: you can redistribute it and/or modify | ||
# it under the terms of the GNU General Public License as published by | ||
# the Free Software Foundation, either version 3 of the License, or | ||
# (at your option) any later version. | ||
# | ||
# Rose is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
# GNU General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU General Public License | ||
# along with Rose. If not, see <http://www.gnu.org/licenses/>. | ||
"""Test metomi/rose/rose.py | ||
""" | ||
|
||
import os | ||
import sys | ||
|
||
from metomi.rose.rose import pythonpath_manip | ||
|
||
|
||
def test_pythonpath_manip(monkeypatch): | ||
"""pythonpath_manip removes items in PYTHONPATH from sys.path | ||
and adds items from ROSE_PYTHONPATH | ||
""" | ||
# If PYTHONPATH is set... | ||
monkeypatch.setenv('PYTHONPATH', '/remove1:/remove2') | ||
monkeypatch.setattr('sys.path', ['/leave-alone', '/remove1', '/remove2']) | ||
pythonpath_manip() | ||
# ... we don't change PYTHONPATH | ||
assert os.environ['PYTHONPATH'] == '/remove1:/remove2' | ||
# ... but we do remove PYTHONPATH items from sys.path, and don't remove | ||
# items there not in PYTHONPATH | ||
assert sys.path == ['/leave-alone'] | ||
|
||
# If ROSE_PYTHONPATH is set we retrieve its contents and | ||
# add them to the sys.path: | ||
monkeypatch.setenv('ROSE_PYTHONPATH', '/add1:/add2') | ||
pythonpath_manip() | ||
assert sys.path == ['/add1', '/add2', '/leave-alone'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,3 +13,5 @@ ignore= | |
E731, | ||
# no longer best practice: | ||
W503 | ||
; module level import not at top of file | ||
E402, | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be able to do this with inline comments rather than globally.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was coping the Cylc
tox.ini
. We don't generally do this, but when we do we usually have our reasons. It's not a fault I think we'll miss.