Skip to content

Treat correctly relative imports in 'import_module_from_file' #305

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Jun 1, 2018
Merged

Treat correctly relative imports in 'import_module_from_file' #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ee3fe1f
Use abs path if the given filename isn't a dir
May 29, 2018
51506eb
Merge branch 'master' into bugfix/relative_path_use
May 29, 2018
f1aa8eb
Add unittests for paths starting with double dot
May 29, 2018
bcf722e
Address PR comments
Jun 1, 2018
bc90a3e
Address PR comments (version 2)
Jun 1, 2018
0f0baa0
Minor style improvements
Jun 1, 2018
348b3f0
Merge branch 'master' into bugfix/relative_path_use
vkarak Jun 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions reframe/utility/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ def import_module_from_file(filename):
if os.path.isdir(filename):
filename = os.path.join(filename, '__init__.py')

if filename.startswith('..'):
filename = os.path.abspath(filename)
Copy link
Contributor

@vkarak vkarak Jun 1, 2018

Choose a reason for hiding this comment

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

I think that this is the only solution. It seems we cannot use the importlib.import_module(), because we don't which package to attach to. Am I right?

Copy link
Contributor Author

@teojgo teojgo Jun 1, 2018

Choose a reason for hiding this comment

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

yes, that is correct.

Copy link
Contributor Author

@teojgo teojgo Jun 1, 2018

Choose a reason for hiding this comment

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

I tested and it now works both with settings and checks defined with relative paths.


module_name = _get_module_name(filename)
if os.path.isabs(filename):
return _do_import_module_from_file(filename, module_name)
Expand Down
14 changes: 14 additions & 0 deletions unittests/test_utility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,20 @@ def test_load_unknown_path(self):
self.assertEqual('foo', e.name)
self.assertEqual('/foo', e.path)

def test_load_directory_relative(self):
with os_ext.change_dir('reframe'):
module = util.import_module_from_file('../reframe')
self.assertEqual(reframe.VERSION, module.VERSION)
self.assertEqual('reframe', module.__name__)
self.assertIs(module, sys.modules.get('reframe'))

def test_load_file_relative(self):
with os_ext.change_dir('reframe'):
module = util.import_module_from_file('../reframe/__init__.py')
self.assertEqual(reframe.VERSION, module.VERSION)
self.assertEqual('reframe', module.__name__)
self.assertIs(module, sys.modules.get('reframe'))

def test_load_twice(self):
filename = os.path.abspath('reframe/__init__.py')
module1 = util.import_module_from_file(filename)
Expand Down