Fix import errors reported by doctests#30
Merged
bluemellophone merged 4 commits intodevelopfrom Jun 10, 2020
Merged
Conversation
Missing import reported when running doctests:
```
Traceback (most recent call last):
File "/virtualenv/env3/lib/python3.6/site-packages/xdoctest/utils/util_import.py", line 187, in _custom_import_modpath
module = import_module_from_name(modname)
File "/virtualenv/env3/lib/python3.6/site-packages/xdoctest/utils/util_import.py", line 345, in import_module_from_name
module = importlib.import_module(modname)
File "/virtualenv/env3/lib/python3.6/importlib/__init__.py", line 126, in import_module
return _bootstrap._gcd_import(name[level:], package, level)
File "<frozen importlib._bootstrap>", line 994, in _gcd_import
File "<frozen importlib._bootstrap>", line 971, in _find_and_load
File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
File "<frozen importlib._bootstrap_external>", line 678, in exec_module
File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
File "/wbia/wildbook-ia/wbia/dtool/_grave_depcache.py", line 138, in <module>
class AlgoRequest(BaseRequest, ut.NiceRepr):
NameError: name 'BaseRequest' is not defined
```
Missing import reported when running doctests:
```
Traceback (most recent call last):
File "/virtualenv/env3/lib/python3.6/site-packages/xdoctest/utils/util_import.py", line 187, in _custom_import_modpath
module = import_module_from_name(modname)
File "/virtualenv/env3/lib/python3.6/site-packages/xdoctest/utils/util_import.py", line 345, in import_module_from_name
module = importlib.import_module(modname)
File "/virtualenv/env3/lib/python3.6/importlib/__init__.py", line 126, in import_module
return _bootstrap._gcd_import(name[level:], package, level)
File "<frozen importlib._bootstrap>", line 994, in _gcd_import
File "<frozen importlib._bootstrap>", line 971, in _find_and_load
File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
File "<frozen importlib._bootstrap_external>", line 678, in exec_module
File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
File "/wbia/wildbook-ia/wbia/dtool/_grave_depcache.py", line 141, in <module>
class AlgoRequest(BaseRequest, ut.NiceRepr):
NameError: name 'ut' is not defined
```
"sklearn.externals.six" was removed from scikit-learn [v0.21](https://scikit-learn.org/dev/whats_new/v0.21.html#sklearn-externals) and the [PR](scikit-learn/scikit-learn#12916) said users should rely on the offical version of six instead of the one in scikit-learn.
When running doctests:
```
DOCTEST TRACEBACK
Traceback (most recent call last):
File "/virtualenv/env3/lib/python3.6/site-packages/xdoctest/doctest_example.py", line 553, in run
exec(code, test_globals)
File "<doctest:/wbia/wildbook-ia/wbia/gui/id_review_api.py::make_ensure_match_img_nosql_func:0>", line rel: 5, abs: 669, in <module>
>>> cm, qreq_ = wbia.testdata_cm()
File "/wbia/wildbook-ia/wbia/init/main_helpers.py", line 524, in testdata_cm
a=a,
File "/wbia/wildbook-ia/wbia/init/main_helpers.py", line 494, in testdata_cmlist
a=a,
File "/wbia/wildbook-ia/wbia/init/main_helpers.py", line 451, in testdata_qreq_
**kwargs,
File "/wbia/wildbook-ia/wbia/init/main_helpers.py", line 342, in testdata_expanded_aids
ibs = wbia.opendb(defaultdb=defaultdb)
File "/wbia/wildbook-ia/wbia/main_module.py", line 594, in opendb
defaultdb=defaultdb, allow_newdir=allow_newdir, db=db, dbdir=dbdir
File "/wbia/wildbook-ia/wbia/init/sysres.py", line 346, in get_args_dbdir
return db_to_dbdir(defaultdb, allow_newdir=allow_newdir)
File "/wbia/wildbook-ia/wbia/init/sysres.py", line 219, in db_to_dbdir
work_dir = get_workdir()
File "/wbia/wildbook-ia/wbia/init/sysres.py", line 92, in get_workdir
work_dir = set_workdir()
File "/wbia/wildbook-ia/wbia/init/sysres.py", line 121, in set_workdir
work_dir = guiselect_workdir()
File "/wbia/wildbook-ia/wbia/init/sysres.py", line 156, in guiselect_workdir
guitool.ensure_qtapp()
NameError: name 'guitool' is not defined
```
This is because we imported guitool like this `import wbia.guitool`, instead I
changed it to `from wbia import guitool`.
Contributor
Author
|
@bluemellophone Next time could you use merge commit or rebase? The changes don't really belong together in one single commit. If there are "wip" or "fixes" commits then I wouldn't object to squashing them. |
Contributor
|
Sure, sorry, I saw three trivial changes but didn't look at the delta diffs between the individual commits. |
Contributor
Author
|
Yeah, this particular PR isn't a problem, just going forward 👍 |
bluemellophone
pushed a commit
that referenced
this pull request
Jul 8, 2020
* Add import for BaseRequest in dtool/_grave_depcache.py
Missing import reported when running doctests:
```
Traceback (most recent call last):
File "/virtualenv/env3/lib/python3.6/site-packages/xdoctest/utils/util_import.py", line 187, in _custom_import_modpath
module = import_module_from_name(modname)
File "/virtualenv/env3/lib/python3.6/site-packages/xdoctest/utils/util_import.py", line 345, in import_module_from_name
module = importlib.import_module(modname)
File "/virtualenv/env3/lib/python3.6/importlib/__init__.py", line 126, in import_module
return _bootstrap._gcd_import(name[level:], package, level)
File "<frozen importlib._bootstrap>", line 994, in _gcd_import
File "<frozen importlib._bootstrap>", line 971, in _find_and_load
File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
File "<frozen importlib._bootstrap_external>", line 678, in exec_module
File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
File "/wbia/wildbook-ia/wbia/dtool/_grave_depcache.py", line 138, in <module>
class AlgoRequest(BaseRequest, ut.NiceRepr):
NameError: name 'BaseRequest' is not defined
```
* Add "import utool" to dtool/_grave_depcache.py
Missing import reported when running doctests:
```
Traceback (most recent call last):
File "/virtualenv/env3/lib/python3.6/site-packages/xdoctest/utils/util_import.py", line 187, in _custom_import_modpath
module = import_module_from_name(modname)
File "/virtualenv/env3/lib/python3.6/site-packages/xdoctest/utils/util_import.py", line 345, in import_module_from_name
module = importlib.import_module(modname)
File "/virtualenv/env3/lib/python3.6/importlib/__init__.py", line 126, in import_module
return _bootstrap._gcd_import(name[level:], package, level)
File "<frozen importlib._bootstrap>", line 994, in _gcd_import
File "<frozen importlib._bootstrap>", line 971, in _find_and_load
File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
File "<frozen importlib._bootstrap_external>", line 678, in exec_module
File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
File "/wbia/wildbook-ia/wbia/dtool/_grave_depcache.py", line 141, in <module>
class AlgoRequest(BaseRequest, ut.NiceRepr):
NameError: name 'ut' is not defined
```
* Import "six" directly instead of "sklearn.externals.six"
"sklearn.externals.six" was removed from scikit-learn
[v0.21](https://scikit-learn.org/dev/whats_new/v0.21.html#sklearn-externals)
and the
[PR](scikit-learn/scikit-learn#12916)
said users should rely on the offical version of six instead of the one
in scikit-learn.
* Fix guitool import in init/sysres.py
When running doctests:
```
DOCTEST TRACEBACK
Traceback (most recent call last):
File "/virtualenv/env3/lib/python3.6/site-packages/xdoctest/doctest_example.py", line 553, in run
exec(code, test_globals)
File "<doctest:/wbia/wildbook-ia/wbia/gui/id_review_api.py::make_ensure_match_img_nosql_func:0>", line rel: 5, abs: 669, in <module>
>>> cm, qreq_ = wbia.testdata_cm()
File "/wbia/wildbook-ia/wbia/init/main_helpers.py", line 524, in testdata_cm
a=a,
File "/wbia/wildbook-ia/wbia/init/main_helpers.py", line 494, in testdata_cmlist
a=a,
File "/wbia/wildbook-ia/wbia/init/main_helpers.py", line 451, in testdata_qreq_
**kwargs,
File "/wbia/wildbook-ia/wbia/init/main_helpers.py", line 342, in testdata_expanded_aids
ibs = wbia.opendb(defaultdb=defaultdb)
File "/wbia/wildbook-ia/wbia/main_module.py", line 594, in opendb
defaultdb=defaultdb, allow_newdir=allow_newdir, db=db, dbdir=dbdir
File "/wbia/wildbook-ia/wbia/init/sysres.py", line 346, in get_args_dbdir
return db_to_dbdir(defaultdb, allow_newdir=allow_newdir)
File "/wbia/wildbook-ia/wbia/init/sysres.py", line 219, in db_to_dbdir
work_dir = get_workdir()
File "/wbia/wildbook-ia/wbia/init/sysres.py", line 92, in get_workdir
work_dir = set_workdir()
File "/wbia/wildbook-ia/wbia/init/sysres.py", line 121, in set_workdir
work_dir = guiselect_workdir()
File "/wbia/wildbook-ia/wbia/init/sysres.py", line 156, in guiselect_workdir
guitool.ensure_qtapp()
NameError: name 'guitool' is not defined
```
This is because we imported guitool like this `import wbia.guitool`, instead I
changed it to `from wbia import guitool`.
bluemellophone
pushed a commit
that referenced
this pull request
Jul 10, 2020
* Add import for BaseRequest in dtool/_grave_depcache.py
Missing import reported when running doctests:
```
Traceback (most recent call last):
File "/virtualenv/env3/lib/python3.6/site-packages/xdoctest/utils/util_import.py", line 187, in _custom_import_modpath
module = import_module_from_name(modname)
File "/virtualenv/env3/lib/python3.6/site-packages/xdoctest/utils/util_import.py", line 345, in import_module_from_name
module = importlib.import_module(modname)
File "/virtualenv/env3/lib/python3.6/importlib/__init__.py", line 126, in import_module
return _bootstrap._gcd_import(name[level:], package, level)
File "<frozen importlib._bootstrap>", line 994, in _gcd_import
File "<frozen importlib._bootstrap>", line 971, in _find_and_load
File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
File "<frozen importlib._bootstrap_external>", line 678, in exec_module
File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
File "/wbia/wildbook-ia/wbia/dtool/_grave_depcache.py", line 138, in <module>
class AlgoRequest(BaseRequest, ut.NiceRepr):
NameError: name 'BaseRequest' is not defined
```
* Add "import utool" to dtool/_grave_depcache.py
Missing import reported when running doctests:
```
Traceback (most recent call last):
File "/virtualenv/env3/lib/python3.6/site-packages/xdoctest/utils/util_import.py", line 187, in _custom_import_modpath
module = import_module_from_name(modname)
File "/virtualenv/env3/lib/python3.6/site-packages/xdoctest/utils/util_import.py", line 345, in import_module_from_name
module = importlib.import_module(modname)
File "/virtualenv/env3/lib/python3.6/importlib/__init__.py", line 126, in import_module
return _bootstrap._gcd_import(name[level:], package, level)
File "<frozen importlib._bootstrap>", line 994, in _gcd_import
File "<frozen importlib._bootstrap>", line 971, in _find_and_load
File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
File "<frozen importlib._bootstrap_external>", line 678, in exec_module
File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
File "/wbia/wildbook-ia/wbia/dtool/_grave_depcache.py", line 141, in <module>
class AlgoRequest(BaseRequest, ut.NiceRepr):
NameError: name 'ut' is not defined
```
* Import "six" directly instead of "sklearn.externals.six"
"sklearn.externals.six" was removed from scikit-learn
[v0.21](https://scikit-learn.org/dev/whats_new/v0.21.html#sklearn-externals)
and the
[PR](scikit-learn/scikit-learn#12916)
said users should rely on the offical version of six instead of the one
in scikit-learn.
* Fix guitool import in init/sysres.py
When running doctests:
```
DOCTEST TRACEBACK
Traceback (most recent call last):
File "/virtualenv/env3/lib/python3.6/site-packages/xdoctest/doctest_example.py", line 553, in run
exec(code, test_globals)
File "<doctest:/wbia/wildbook-ia/wbia/gui/id_review_api.py::make_ensure_match_img_nosql_func:0>", line rel: 5, abs: 669, in <module>
>>> cm, qreq_ = wbia.testdata_cm()
File "/wbia/wildbook-ia/wbia/init/main_helpers.py", line 524, in testdata_cm
a=a,
File "/wbia/wildbook-ia/wbia/init/main_helpers.py", line 494, in testdata_cmlist
a=a,
File "/wbia/wildbook-ia/wbia/init/main_helpers.py", line 451, in testdata_qreq_
**kwargs,
File "/wbia/wildbook-ia/wbia/init/main_helpers.py", line 342, in testdata_expanded_aids
ibs = wbia.opendb(defaultdb=defaultdb)
File "/wbia/wildbook-ia/wbia/main_module.py", line 594, in opendb
defaultdb=defaultdb, allow_newdir=allow_newdir, db=db, dbdir=dbdir
File "/wbia/wildbook-ia/wbia/init/sysres.py", line 346, in get_args_dbdir
return db_to_dbdir(defaultdb, allow_newdir=allow_newdir)
File "/wbia/wildbook-ia/wbia/init/sysres.py", line 219, in db_to_dbdir
work_dir = get_workdir()
File "/wbia/wildbook-ia/wbia/init/sysres.py", line 92, in get_workdir
work_dir = set_workdir()
File "/wbia/wildbook-ia/wbia/init/sysres.py", line 121, in set_workdir
work_dir = guiselect_workdir()
File "/wbia/wildbook-ia/wbia/init/sysres.py", line 156, in guiselect_workdir
guitool.ensure_qtapp()
NameError: name 'guitool' is not defined
```
This is because we imported guitool like this `import wbia.guitool`, instead I
changed it to `from wbia import guitool`.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Add import for BaseRequest in dtool/_grave_depcache.py
Missing import reported when running doctests:
Add "import utool" to dtool/_grave_depcache.py
Missing import reported when running doctests:
Import "six" directly instead of "sklearn.externals.six"
"sklearn.externals.six" was removed from scikit-learn
v0.21
and the
PR
said users should rely on the offical version of six instead of the one
in scikit-learn.
Fix guitool import in init/sysres.py
When running doctests:
This is because we imported guitool like this
import wbia.guitool, instead Ichanged it to
from wbia import guitool.