Skip to content

Commit 19a7502

Browse files
authored
Force LF as line-ending for operator modules (#2154)
* Force LF as line-ending for operator modules to prevent files marked as modified when generating on a different OS * Add a .gitattributes
1 parent 7917c7b commit 19a7502

File tree

2 files changed

+69
-6
lines changed

2 files changed

+69
-6
lines changed

.gitattributes

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
###############################################################################
2+
# Set default behavior to automatically normalize line endings.
3+
###############################################################################
4+
* text=auto
5+
6+
###############################################################################
7+
# Set default behavior for command prompt diff.
8+
#
9+
# This is need for earlier builds of msysgit that does not have it on by
10+
# default for csharp files.
11+
# Note: This is only used by command line
12+
###############################################################################
13+
#*.cs diff=csharp
14+
15+
###############################################################################
16+
# Set the merge driver for project and solution files
17+
#
18+
# Merging from the command prompt will add diff markers to the files if there
19+
# are conflicts (Merging from VS is not affected by the settings below, in VS
20+
# the diff markers are never inserted). Diff markers may cause the following
21+
# file extensions to fail to load in VS. An alternative would be to treat
22+
# these files as binary and thus will always conflict and require user
23+
# intervention with every merge. To do so, just uncomment the entries below
24+
###############################################################################
25+
#*.sln merge=binary
26+
#*.csproj merge=binary
27+
#*.vbproj merge=binary
28+
#*.vcxproj merge=binary
29+
#*.vcproj merge=binary
30+
#*.dbproj merge=binary
31+
#*.fsproj merge=binary
32+
#*.lsproj merge=binary
33+
#*.wixproj merge=binary
34+
#*.modelproj merge=binary
35+
#*.sqlproj merge=binary
36+
#*.wwaproj merge=binary
37+
38+
###############################################################################
39+
# behavior for image files
40+
#
41+
# image files are treated as binary by default.
42+
###############################################################################
43+
*.jpg binary
44+
*.png binary
45+
*.gif binary
46+
47+
###############################################################################
48+
# diff behavior for common document formats
49+
#
50+
# Convert binary document formats to text before diffing them. This feature
51+
# is only available from the command line. Turn it on by uncommenting the
52+
# entries below.
53+
###############################################################################
54+
#*.doc diff=astextplain
55+
#*.DOC diff=astextplain
56+
#*.docx diff=astextplain
57+
#*.DOCX diff=astextplain
58+
#*.dot diff=astextplain
59+
#*.DOT diff=astextplain
60+
#*.pdf diff=astextplain
61+
#*.PDF diff=astextplain
62+
#*.rtf diff=astextplain
63+
#*.RTF diff=astextplain

src/ansys/dpf/core/operators/build.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ def build_operators():
234234

235235
# Write to operator file
236236
operator_file = os.path.join(category_path, scripting_name + ".py")
237-
with open(operator_file, "wb") as f:
237+
with open(operator_file, "w", encoding='utf-8', newline="\u000A") as f:
238238
operator_str = scripting_name
239239
try:
240240
operator_str = build_operator(
@@ -246,7 +246,7 @@ def build_operators():
246246
specification_description,
247247
)
248248
exec(operator_str, globals())
249-
f.write(operator_str.encode())
249+
f.write(operator_str)
250250
succeeded += 1
251251
except SyntaxError as e:
252252
error_message = (
@@ -262,17 +262,17 @@ def build_operators():
262262

263263
# Create __init__.py files
264264
print(f"Generating __init__.py files...")
265-
with open(os.path.join(this_path, "__init__.py"), "wb") as main_init:
265+
with open(os.path.join(this_path, "__init__.py"), "w", encoding="utf-8", newline="\u000A") as main_init:
266266
for category in sorted(categories):
267267
# Add category to main init file imports
268-
main_init.write(f"from . import {category}\n".encode())
268+
main_init.write(f"from . import {category}\n")
269269
# Create category init file
270270
category_operators = os.listdir(os.path.join(this_path, category.split(".")[0]))
271-
with open(os.path.join(this_path, category, "__init__.py"), "wb") as category_init:
271+
with open(os.path.join(this_path, category, "__init__.py"), "w", encoding="utf-8", newline="\u000A") as category_init:
272272
for category_operator in sorted(category_operators):
273273
operator_name = category_operator.split(".")[0]
274274
category_init.write(
275-
f"from .{operator_name} import {operator_name}\n".encode()
275+
f"from .{operator_name} import {operator_name}\n"
276276
)
277277

278278
if succeeded == len(available_operators) - hidden:

0 commit comments

Comments
 (0)