Skip to content

Commit efe360f

Browse files
committed
Fix ch 6, r 2 for Intel Docker image testing
- Use .resolve() on paths, so that symlinks are properly handled - Use the Path.open syntax of pathlib
1 parent 267e681 commit efe360f

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

.circleci/config.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ variables:
3535
name: Testing
3636
shell: /bin/bash
3737
command: |
38-
pipenv run python testing/collect_tests.py 'chapter-01/recipe-*'
39-
pipenv run python testing/collect_tests.py 'chapter-02/recipe-*'
40-
pipenv run python testing/collect_tests.py 'chapter-03/recipe-*'
41-
pipenv run python testing/collect_tests.py 'chapter-04/recipe-*'
42-
pipenv run python testing/collect_tests.py 'chapter-05/recipe-*'
43-
pipenv run python testing/collect_tests.py 'chapter-06/recipe-*'
44-
pipenv run python testing/collect_tests.py 'chapter-07/recipe-*'
45-
pipenv run python testing/collect_tests.py 'chapter-08/recipe-*'
46-
pipenv run python testing/collect_tests.py 'chapter-09/recipe-*'
47-
pipenv run python testing/collect_tests.py 'chapter-10/recipe-*'
48-
pipenv run python testing/collect_tests.py 'chapter-11/recipe-0[1-3]'
49-
pipenv run python testing/collect_tests.py 'chapter-12/recipe-*'
50-
pipenv run python testing/collect_tests.py 'chapter-13/recipe-*'
38+
pipenv run python testing/collect_tests.py 'chapter-01/recipe-*' &&
39+
pipenv run python testing/collect_tests.py 'chapter-02/recipe-*' &&
40+
pipenv run python testing/collect_tests.py 'chapter-03/recipe-*' &&
41+
pipenv run python testing/collect_tests.py 'chapter-04/recipe-*' &&
42+
pipenv run python testing/collect_tests.py 'chapter-05/recipe-*' &&
43+
pipenv run python testing/collect_tests.py 'chapter-06/recipe-*' &&
44+
pipenv run python testing/collect_tests.py 'chapter-07/recipe-*' &&
45+
pipenv run python testing/collect_tests.py 'chapter-08/recipe-*' &&
46+
pipenv run python testing/collect_tests.py 'chapter-09/recipe-*' &&
47+
pipenv run python testing/collect_tests.py 'chapter-10/recipe-*' &&
48+
pipenv run python testing/collect_tests.py 'chapter-11/recipe-0[1-3]' &&
49+
pipenv run python testing/collect_tests.py 'chapter-12/recipe-*' &&
50+
pipenv run python testing/collect_tests.py 'chapter-13/recipe-*' &&
5151
pipenv run python testing/collect_tests.py 'chapter-14/recipe-*'
5252
tests-conda: &tests-conda
5353
run:

chapter-06/recipe-02/fortran-c-example/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ vars_dict = {
5757
'CMAKE_Fortran_COMPILER': '${CMAKE_Fortran_COMPILER}',
5858
'CMAKE_C_COMPILER': '${CMAKE_C_COMPILER}',
5959
}
60-
configure_file(input_file, output_file, vars_dict)
60+
configure_file(input_file.resolve(), output_file.resolve(), vars_dict)
6161
")
6262

6363
find_package(PythonInterp QUIET REQUIRED)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
def configure_file(input_file, output_file, vars_dict):
22

3-
with open(input_file, 'r') as f:
3+
with input_file.open('r') as f:
44
template = f.read()
55

66
for var in vars_dict:
77
template = template.replace('@' + var + '@', vars_dict[var])
88

9-
with open(output_file, 'w') as f:
9+
with output_file.open('w') as f:
1010
f.write(template)

0 commit comments

Comments
 (0)