Skip to content
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.

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

Fix the custom file header #1346

Merged
merged 6 commits into from
Jun 5, 2023
Merged

Conversation

Fokko
Copy link
Contributor

@Fokko Fokko commented Jun 2, 2023

Looks like the argument is missing :)

if path is None:
file = None
else:
if not path.parent.exists():
path.parent.mkdir(parents=True)
file = path.open('wt', encoding=encoding)

if custom_file_header and os.path.exists(custom_file_header):
with open(custom_file_header) as header_file:
custom_file_header = ''.join(header_file.readlines())
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@koxudaxi I took the liberty and added the option to read the header from file as well. We need to add the ASF header to each of the file in Iceberg: https://github.com/apache/iceberg/pull/7751/files Passing in a multi line string as an argument is a bit of a pain, so I figured this would be a nice addition.

@codecov
Copy link

codecov bot commented Jun 5, 2023

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (e9b6edf) 100.00% compared to head (743d4f3) 100.00%.

Additional details and impacted files
@@             Coverage Diff             @@
##            master     #1346     +/-   ##
===========================================
  Coverage   100.00%   100.00%             
===========================================
  Files           11        26     +15     
  Lines         1020      3341   +2321     
  Branches       201       794    +593     
===========================================
+ Hits          1020      3341   +2321     
Flag Coverage Δ
unittests 99.94% <99.92%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
datamodel_code_generator/__init__.py 100.00% <100.00%> (ø)
datamodel_code_generator/__main__.py 100.00% <100.00%> (ø)
datamodel_code_generator/format.py 100.00% <100.00%> (ø)
datamodel_code_generator/http.py 100.00% <100.00%> (ø)
datamodel_code_generator/imports.py 100.00% <100.00%> (ø)
datamodel_code_generator/model/__init__.py 100.00% <100.00%> (ø)
datamodel_code_generator/model/base.py 100.00% <100.00%> (ø)
datamodel_code_generator/model/dataclass.py 100.00% <100.00%> (ø)
datamodel_code_generator/model/enum.py 100.00% <100.00%> (ø)
datamodel_code_generator/model/improts.py 100.00% <100.00%> (ø)
... and 16 more

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@@ -500,15 +500,18 @@ def get_header_and_first_line(csv_file: IO[str]) -> Dict[str, Any]:
header += f'\n# version: {get_version()}'

file: Optional[IO[Any]]
for path, body_and_filename in modules.items():
body, filename = body_and_filename
for path, (body, filename) in modules.items():
Copy link
Owner

Choose a reason for hiding this comment

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

Oh, I didn't realize the way to unpack the tuple in the for statement.
Thank you!!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thought that was a nice addition, any time! 👍🏻

Comment on lines +437 to +442
arg_parser.add_argument(
'--custom-file-header-path',
help='Custom file header file path',
default=None,
type=str,
)
Copy link
Owner

Choose a reason for hiding this comment

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

@Fokko
I add a new option to avoid confusion.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That works for me as well :) I was considering that as well

@koxudaxi koxudaxi merged commit 95df46e into koxudaxi:master Jun 5, 2023
43 checks passed
@Fokko Fokko deleted the fd-fix-custom-file-header branch June 5, 2023 17:07
@koxudaxi
Copy link
Owner

koxudaxi commented Jun 6, 2023

@Fokko
I have released the new version as 0.20.0
Thank you very much!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants