Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
fluiddyn
fluidsim
Commits
6bab0194d106
Commit
fc17488e
authored
Apr 01, 2020
by
Ashwin Vishnu
Browse files
Regression fix runpy.run_path
parent
dacca8decb56
Pipeline
#4652
passed with stage
in 9 minutes and 16 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
setup.py
View file @
6bab0194
...
...
@@ -28,7 +28,7 @@ try:
from
setup_config
import
FFTW3
,
logger
except
ImportError
:
# needed when there is already a module with the same name imported.
setup_config
=
run_path
(
here
/
"setup_config.py"
)
setup_config
=
run_path
(
str
(
here
/
"setup_config.py"
)
)
FFTW3
=
setup_config
[
"FFTW3"
]
logger
=
setup_config
[
"logger"
]
...
...
@@ -36,7 +36,7 @@ try:
from
setup_build
import
FluidSimBuildExt
except
ImportError
:
# needed when there is already a module with the same name imported.
FluidSimBuildExt
=
run_path
(
here
/
"setup_build.py"
)[
"FluidSimBuildExt"
]
FluidSimBuildExt
=
run_path
(
str
(
here
/
"setup_build.py"
)
)
[
"FluidSimBuildExt"
]
time_start
=
time
()
...
...
setup_build.py
View file @
6bab0194
...
...
@@ -9,7 +9,7 @@ try:
from
setup_config
import
PARALLEL_COMPILE
except
ImportError
:
# needed when there is already a module with the same name imported.
setup_config
=
run_path
(
here
/
"setup_config.py"
)
setup_config
=
run_path
(
str
(
here
/
"setup_config.py"
)
)
PARALLEL_COMPILE
=
setup_config
[
"PARALLEL_COMPILE"
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment