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

[TechDraw] Update Peoples Republic of China templates #3743

Merged
merged 3 commits into from Jul 28, 2020

Conversation

luzpaz
Copy link
Contributor

@luzpaz luzpaz commented Jul 26, 2020

felix added 2 commits July 26, 2020 09:15
Add all landscape template files in landscape directory.
create new directory portrait and put A3/A4 portrait
template files to the directory.
@luzpaz
Copy link
Contributor Author

luzpaz commented Jul 26, 2020

Added [skip-ci] to the last commit to avoid triggering travis

@vocx-fc
Copy link
Contributor

vocx-fc commented Jul 26, 2020

Just a note. Some of the SVGs cannot be previewed on GitHub. This may have two causes:

  • A GitHub problem; in the past I have noticed that GitHub experiences a temporary problem, and fails to display SVGs even if they are tiny in size, 4 KB or so. In this case we just have to wait until GitHub fixes itself.
  • A problem with the SVG. If the SVG is not correctly constructed or has non-standard tags, it may be reported as Invalid, and fail to display. Make sure you save the SVG as "Plain SVG" as opposed to "Inskcape SVG". See Draft: icons as plain SVG and with 96 dpi resolution #3060 and the links there for more information. In particular, using "Inkscape SVG" was found to cause problems sometimes when using such templates in TechDraw, [regression] export to SVG broken.

@WandererFan
Copy link
Contributor

Is this ok to merge or does @vocx-fc comment need to be addressed?

@vocx-fc
Copy link
Contributor

vocx-fc commented Jul 27, 2020

I think you can merge it; if it causes problems Felix or other Chinese users will report it, and at that point somebody who is familiar with these templates should step in to help.

@WandererFan WandererFan merged commit 4329ccd into FreeCAD:master Jul 28, 2020
@WandererFan
Copy link
Contributor

merged.

@felixlee868
Copy link
Contributor

felixlee868 commented Jul 29, 2020 via email

@luzpaz luzpaz deleted the TD_Template_zh_CN branch July 30, 2020 13:22
mosfet80 added a commit to mosfet80/FreeCAD that referenced this pull request Dec 14, 2023
Change Log


23.12.0
Highlights
It's almost 2024, which means it's time for a new edition of Black's stable style! Together with this release, we'll put out an alpha release 24.1a1 showcasing the draft 2024 stable style, which we'll finalize in the January release. Please try it out and share your feedback.

This release (23.12.0) will still produce the 2023 style. Most but not all of the changes in --preview mode will be in the 2024 stable style.

Stable style
Fix bug where # fmt: off automatically dedents when used with the --line-ranges option, even when it is not within the specified line range. (FreeCAD#4084)
Fix feature detection for parenthesized context managers (FreeCAD#4104)
Preview style
Prefer more equal signs before a break when splitting chained assignments (FreeCAD#4010)
Standalone form feed characters at the module level are no longer removed (FreeCAD#4021)
Additional cases of immediately nested tuples, lists, and dictionaries are now indented less (FreeCAD#4012)
Allow empty lines at the beginning of all blocks, except immediately before a docstring (FreeCAD#4060)
Fix crash in preview mode when using a short --line-length (FreeCAD#4086)
Keep suites consisting of only an ellipsis on their own lines if they are not functions or class definitions (FreeCAD#4066) (FreeCAD#4103)
Configuration
--line-ranges now skips Black's internal stability check in --safe mode. This avoids a crash on rare inputs that have many unformatted same-content lines. (FreeCAD#4034)
Packaging
Upgrade to mypy 1.7.1 (FreeCAD#4049) (FreeCAD#4069)
Faster compiled wheels are now available for CPython 3.12 (FreeCAD#4070)
Integrations
Enable 3.12 CI (FreeCAD#4035)
Build docker images in parallel (FreeCAD#4054)
Build docker images with 3.12 (FreeCAD#4055)
23.11.0
Highlights
Support formatting ranges of lines with the new --line-ranges command-line option (FreeCAD#4020)
Stable style
Fix crash on formatting bytes strings that look like docstrings (FreeCAD#4003)
Fix crash when whitespace followed a backslash before newline in a docstring (FreeCAD#4008)
Fix standalone comments inside complex blocks crashing Black (FreeCAD#4016)
Fix crash on formatting code like await (a ** b) (FreeCAD#3994)
No longer treat leading f-strings as docstrings. This matches Python's behaviour and fixes a crash (FreeCAD#4019)
Preview style
Multiline dicts and lists that are the sole argument to a function are now indented less (FreeCAD#3964)
Multiline unpacked dicts and lists as the sole argument to a function are now also indented less (FreeCAD#3992)
In f-string debug expressions, quote types that are visible in the final string are now preserved (FreeCAD#4005)
Fix a bug where long case blocks were not split into multiple lines. Also enable general trailing comma rules on case blocks (FreeCAD#4024)
Keep requiring two empty lines between module-level docstring and first function or class definition (FreeCAD#4028)
Add support for single-line format skip with other comments on the same line (FreeCAD#3959)
Configuration
Consistently apply force exclusion logic before resolving symlinks (FreeCAD#4015)
Fix a bug in the matching of absolute path names in --include (FreeCAD#3976)
Performance
Fix mypyc builds on arm64 on macOS (FreeCAD#4017)
Integrations
Black's pre-commit integration will now run only on git hooks appropriate for a code formatter (FreeCAD#3940)
23.10.1
Highlights
Maintenance release to get a fix out for GitHub Action edge case (FreeCAD#3957)
Preview style
Fix merging implicit multiline strings that have inline comments (FreeCAD#3956)
Allow empty first line after block open before a comment or compound statement (FreeCAD#3967)
Packaging
Change Dockerfile to hatch + compile black (FreeCAD#3965)
Integrations
The summary output for GitHub workflows is now suppressible using the summary parameter. (FreeCAD#3958)
Fix the action failing when Black check doesn't pass (FreeCAD#3957)
Documentation
It is known Windows documentation CI is broken FreeCAD#3968
23.10.0
Stable style
Fix comments getting removed from inside parenthesized strings (FreeCAD#3909)
Preview style
Fix long lines with power operators getting split before the line length (FreeCAD#3942)
Long type hints are now wrapped in parentheses and properly indented when split across multiple lines (FreeCAD#3899)
Magic trailing commas are now respected in return types. (FreeCAD#3916)
Require one empty line after module-level docstrings. (FreeCAD#3932)
Treat raw triple-quoted strings as docstrings (FreeCAD#3947)
Configuration
Fix cache versioning logic when BLACK_CACHE_DIR is set (FreeCAD#3937)
Parser
Fix bug where attributes named type were not accepted inside match statements (FreeCAD#3950)
Add support for PEP 695 type aliases containing lambdas and other unusual expressions (FreeCAD#3949)
Output
Black no longer attempts to provide special errors for attempting to format Python 2 code (FreeCAD#3933)
Black will more consistently print stacktraces on internal errors in verbose mode (FreeCAD#3938)
Integrations
The action output displayed in the job summary is now wrapped in Markdown (FreeCAD#3914)
23.9.1
Due to various issues, the previous release (23.9.0) did not include compiled mypyc wheels, which make Black significantly faster. These issues have now been fixed, and this release should come with compiled wheels once again.

There will be no wheels for Python 3.12 due to a bug in mypyc. We will provide 3.12 wheels in a future release as soon as the mypyc bug is fixed.

Packaging
Upgrade to mypy 1.5.1 (FreeCAD#3864)
Performance
Store raw tuples instead of NamedTuples in Black's cache, improving performance and decreasing the size of the cache (FreeCAD#3877)
23.9.0
Preview style
More concise formatting for dummy implementations (FreeCAD#3796)
In stub files, add a blank line between a statement with a body (e.g an if sys.version_info > (3, x):) and a function definition on the same level (FreeCAD#3862)
Fix a bug whereby spaces were removed from walrus operators within subscript(FreeCAD#3823)
Configuration
Black now applies exclusion and ignore logic before resolving symlinks (FreeCAD#3846)
Performance
Avoid importing IPython if notebook cells do not contain magics (FreeCAD#3782)
Improve caching by comparing file hashes as fallback for mtime and size (FreeCAD#3821)
Blackd
Fix an issue in blackd with single character input (FreeCAD#3558)
Integrations
Black now has an official pre-commit mirror. Swapping https://github.com/psf/black to https://github.com/psf/black-pre-commit-mirror in your .pre-commit-config.yaml will make Black about 2x faster (FreeCAD#3828)
The .black.env folder specified by ENV_PATH will now be removed on the completion of the GitHub Action (FreeCAD#3759)
23.7.0
Highlights
Runtime support for Python 3.7 has been removed. Formatting 3.7 code will still be supported until further notice (FreeCAD#3765)
Stable style
Fix a bug where an illegal trailing comma was added to return type annotations using PEP 604 unions (FreeCAD#3735)
Fix several bugs and crashes where comments in stub files were removed or mishandled under some circumstances (FreeCAD#3745)
Fix a crash with multi-line magic comments like type: ignore within parentheses (FreeCAD#3740)
Fix error in AST validation when Black removes trailing whitespace in a type comment (FreeCAD#3773)
Preview style
Implicitly concatenated strings used as function args are no longer wrapped inside parentheses (FreeCAD#3640)
Remove blank lines between a class definition and its docstring (FreeCAD#3692)
Configuration
The --workers argument to Black can now be specified via the BLACK_NUM_WORKERS environment variable (FreeCAD#3743)
.pytest_cache, .ruff_cache and .vscode are now excluded by default (FreeCAD#3691)
Fix Black not honouring pyproject.toml settings when running --stdin-filename and the pyproject.toml found isn't in the current working directory (FreeCAD#3719)
Black will now error if exclude and extend-exclude have invalid data types in pyproject.toml, instead of silently doing the wrong thing (FreeCAD#3764)
Packaging
Upgrade mypyc from 0.991 to 1.3 (FreeCAD#3697)
Remove patching of Click that mitigated errors on Python 3.6 with LANG=C (FreeCAD#3768)
Parser
Add support for the new PEP 695 syntax in Python 3.12 (FreeCAD#3703)
Performance
Speed up Black significantly when the cache is full (FreeCAD#3751)
Avoid importing IPython in a case where we wouldn't need it (FreeCAD#3748)
Output
Use aware UTC datetimes internally, avoids deprecation warning on Python 3.12 (FreeCAD#3728)
Change verbose logging to exactly mirror Black's logic for source discovery (FreeCAD#3749)
Blackd
The blackd argument parser now shows the default values for options in their help text (FreeCAD#3712)
Integrations
Black is now tested with PYTHONWARNDEFAULTENCODING = 1 (FreeCAD#3763)
Update GitHub Action to display black output in the job summary (FreeCAD#3688)
Documentation
Add a CITATION.cff file to the root of the repository, containing metadata on how to cite this software (FreeCAD#3723)
Update the classes and exceptions documentation in Developer reference to match the latest code base (FreeCAD#3755)
23.3.0
Highlights
This release fixes a longstanding confusing behavior in Black's GitHub action, where the version of the action did not determine the version of Black being run (issue FreeCAD#3382). In addition, there is a small bug fix around imports and a number of improvements to the preview style.

Please try out the preview style with black --preview and tell us your feedback. All changes in the preview style are expected to become part of Black's stable style in January 2024.

Stable style
Import lines with # fmt: skip and # fmt: off no longer have an extra blank line added when they are right after another import line (FreeCAD#3610)
Preview style
Add trailing commas to collection literals even if there's a comment after the last entry (FreeCAD#3393)
async def, async for, and async with statements are now formatted consistently compared to their non-async version. (FreeCAD#3609)
with statements that contain two context managers will be consistently wrapped in parentheses (FreeCAD#3589)
Let string splitters respect East Asian Width (FreeCAD#3445)
Now long string literals can be split after East Asian commas and periods (、 U+3001 IDEOGRAPHIC COMMA, 。 U+3002 IDEOGRAPHIC FULL STOP, & , U+FF0C FULLWIDTH COMMA) besides before spaces (FreeCAD#3445)
For stubs, enforce one blank line after a nested class with a body other than just ... (FreeCAD#3564)
Improve handling of multiline strings by changing line split behavior (FreeCAD#1879)
Parser
Added support for formatting files with invalid type comments (FreeCAD#3594)
Integrations
Update GitHub Action to use the version of Black equivalent to action's version if version input is not specified (FreeCAD#3543)
Fix missing Python binary path in autoload script for vim (FreeCAD#3508)
Documentation
Document that only the most recent release is supported for security issues; vulnerabilities should be reported through Tidelift (FreeCAD#3612)
23.1.0
Highlights
This is the first release of 2023, and following our stability policy, it comes with a number of improvements to our stable style, including improvements to empty line handling, removal of redundant parentheses in several contexts, and output that highlights implicitly concatenated strings better.

There are also many changes to the preview style; try out black --preview and give us feedback to help us set the stable style for next year.

In addition to style changes, Black now automatically infers the supported Python versions from your pyproject.toml file, removing the need to set Black's target versions separately.

Stable style
Introduce the 2023 stable style, which incorporates most aspects of last year's preview style (FreeCAD#3418). Specific changes:
Enforce empty lines before classes and functions with sticky leading comments (FreeCAD#3302) (22.12.0)
Reformat empty and whitespace-only files as either an empty file (if no newline is present) or as a single newline character (if a newline is present) (FreeCAD#3348) (22.12.0)
Implicitly concatenated strings used as function args are now wrapped inside parentheses (FreeCAD#3307) (22.12.0)
Correctly handle trailing commas that are inside a line's leading non-nested parens (FreeCAD#3370) (22.12.0)
--skip-string-normalization / -S now prevents docstring prefixes from being normalized as expected (FreeCAD#3168) (since 22.8.0)
When using --skip-magic-trailing-comma or -C, trailing commas are stripped from subscript expressions with more than 1 element (FreeCAD#3209) (22.8.0)
Implicitly concatenated strings inside a list, set, or tuple are now wrapped inside parentheses (FreeCAD#3162) (22.8.0)
Fix a string merging/split issue when a comment is present in the middle of implicitly concatenated strings on its own line (FreeCAD#3227) (22.8.0)
Docstring quotes are no longer moved if it would violate the line length limit (FreeCAD#3044, FreeCAD#3430) (22.6.0)
Parentheses around return annotations are now managed (FreeCAD#2990) (22.6.0)
Remove unnecessary parentheses around awaited objects (FreeCAD#2991) (22.6.0)
Remove unnecessary parentheses in with statements (FreeCAD#2926) (22.6.0)
Remove trailing newlines after code block open (FreeCAD#3035) (22.6.0)
Code cell separators #%% are now standardised to # %% (FreeCAD#2919) (22.3.0)
Remove unnecessary parentheses from except statements (FreeCAD#2939) (22.3.0)
Remove unnecessary parentheses from tuple unpacking in for loops (FreeCAD#2945) (22.3.0)
Avoid magic-trailing-comma in single-element subscripts (FreeCAD#2942) (22.3.0)
Fix a crash when a colon line is marked between # fmt: off and # fmt: on (FreeCAD#3439)
Preview style
Format hex codes in unicode escape sequences in string literals (FreeCAD#2916)
Add parentheses around if-else expressions (FreeCAD#2278)
Improve performance on large expressions that contain many strings (FreeCAD#3467)
Fix a crash in preview style with assert + parenthesized string (FreeCAD#3415)
Fix crashes in preview style with walrus operators used in function return annotations and except clauses (FreeCAD#3423)
Fix a crash in preview advanced string processing where mixed implicitly concatenated regular and f-strings start with an empty span (FreeCAD#3463)
Fix a crash in preview advanced string processing where a standalone comment is placed before a dict's value (FreeCAD#3469)
Fix an issue where extra empty lines are added when a decorator has # fmt: skip applied or there is a standalone comment between decorators (FreeCAD#3470)
Do not put the closing quotes in a docstring on a separate line, even if the line is too long (FreeCAD#3430)
Long values in dict literals are now wrapped in parentheses; correspondingly unnecessary parentheses around short values in dict literals are now removed; long string lambda values are now wrapped in parentheses (FreeCAD#3440)
Fix two crashes in preview style involving edge cases with docstrings (FreeCAD#3451)
Exclude string type annotations from improved string processing; fix crash when the return type annotation is stringified and spans across multiple lines (FreeCAD#3462)
Wrap multiple context managers in parentheses when targeting Python 3.9+ (FreeCAD#3489)
Fix several crashes in preview style with walrus operators used in with statements or tuples (FreeCAD#3473)
Fix an invalid quote escaping bug in f-string expressions where it produced invalid code. Implicitly concatenated f-strings with different quotes can now be merged or quote-normalized by changing the quotes used in expressions. (FreeCAD#3509)
Fix crash on await (yield) when Black is compiled with mypyc (FreeCAD#3533)
Configuration
Black now tries to infer its --target-version from the project metadata specified in pyproject.toml (FreeCAD#3219)
Packaging
Upgrade mypyc from 0.971 to 0.991 so mypycified Black can be built on armv7 (FreeCAD#3380)
This also fixes some crashes while using compiled Black with a debug build of CPython
Drop specific support for the tomli requirement on 3.11 alpha releases, working around a bug that would cause the requirement not to be installed on any non-final Python releases (FreeCAD#3448)
Black now depends on packaging version 22.0 or later. This is required for new functionality that needs to parse part of the project metadata (FreeCAD#3219)
Output
Calling black --help multiple times will return the same help contents each time (FreeCAD#3516)
Verbose logging now shows the values of pyproject.toml configuration variables (FreeCAD#3392)
Fix false symlink detection messages in verbose output due to using an incorrect relative path to the project root (FreeCAD#3385)
Integrations
Move 3.11 CI to normal flow now that all dependencies support 3.11 (FreeCAD#3446)
Docker: Add new latest_prerelease tag automation to follow latest black alpha release on docker images (FreeCAD#3465)
Documentation
Expand vim-plug installation instructions to offer more explicit options (FreeCAD#3468)
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

4 participants