Skip to content

Commit

Permalink
Merge branch 'mozman:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
quipo authored Jan 24, 2024
2 parents 04d8b5d + bf737bf commit b7853f3
Show file tree
Hide file tree
Showing 435 changed files with 138,404 additions and 6,078 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ A clear and concise description of what the bug is.

**To Reproduce**
Information and data needed to reproduce the error:
1. A *simplified* Python script which triggers the error.
1. A *simplified* and executable Python script which triggers the error.
2. Information about the *ezdxf* version and the OS.
3. If a 3rd party DXF file causes the error, add a *simplified* and *zipped*
3. If processing a loaded DXF file causes the error, add a *simplified* and *zipped*
DXF file which still triggers the error.

**Confidential Data**
Expand Down
18 changes: 18 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: Pull Request Template
about: Create a pull request to merge your contribution.

---

Describe your changes. Please, keep the description short and simple.

__Important:__ choose `base: master` as the target branch

_Optional_ things you can do before requesting a review:

- Type check the code: `mypy --ignore-missing-imports -p ezdxf`, `ezdxf` has to be installed in dev-mode for that.
- Run the core tests: `pytest tests`
- Format the code by `black` with the default settings.
- Write tests.
- Write a documentation, when adding new features. Doesn't have to be `RestructuredText`,
`Markdown` or simple text is OK, just enough to save me time.
2 changes: 1 addition & 1 deletion .github/workflows/deploy_manylinux2010_x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
CIBW_ARCHS_LINUX: "x86_64"
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010
# cp310 is deployed for manylinux2014
CIBW_BUILD: cp38-* cp39-*
CIBW_BUILD: cp39-*
- name: Upload manylinux2010_x86_64 wheels to PyPI
env:
TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_manylinux2014_aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
CIBW_BEFORE_BUILD: "pip install setuptools wheel cython"
CIBW_ARCHS_LINUX: "aarch64"
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-*
CIBW_BUILD: cp39-* cp310-* cp311-* cp312-*
- name: Upload manylinux2014_aarch64 wheels to PyPI
env:
TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_win_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
CIBW_ARCHS_WINDOWS: "AMD64"
CIBW_ARCHS_MACOS: "x86_64 arm64 universal2"
# Does not fail at unsupported Python versions!
CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-*
CIBW_BUILD: cp39-* cp310-* cp311-* cp312-*
- name: Upload wheels
env:
TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/testcext.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12-dev']
python-version: ['3.9', '3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v3
Expand All @@ -23,7 +23,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install setuptools wheel pytest pyparsing fonttools numpy
python -m pip install setuptools wheel pytest pyparsing fonttools numpy Pillow
- name: Install with C-extensions
run: |
python setup.py install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12-dev', 'pypy-3.9']
python-version: ['3.9', '3.10', '3.11', '3.12', 'pypy-3.9']

steps:
- uses: actions/checkout@v3
Expand All @@ -24,7 +24,7 @@ jobs:
run: |
python -m pip install --upgrade pip
# Excluding Cython to test the pure Python version.
python -m pip install setuptools wheel pytest pyparsing fonttools numpy
python -m pip install setuptools wheel pytest pyparsing fonttools numpy Pillow
- name: Install without C-extensions
run: |
python setup.py install
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include NEWS.md README.md LICENSE
include README.md LICENSE
include requirements.txt
include src/ezdxf/py.typed
recursive-include src/ezdxf/acc *.hpp *.cpp *.h *.c *.pxd *.pyx
Expand Down
1,705 changes: 0 additions & 1,705 deletions NEWS.md

This file was deleted.

66 changes: 37 additions & 29 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@

ezdxf
=====
# ezdxf

Abstract
--------
## Abstract

This Python package is designed to facilitate the creation and manipulation of DXF
documents, with compatibility across various DXF versions. It empowers users to
Expand All @@ -13,22 +11,21 @@ Any unfamiliar DXF tags encountered in the document are gracefully ignored but r
for future modifications. This feature enables the processing of DXF documents
containing data from third-party applications without any loss of valuable information.

Quick-Info
----------
## Quick-Info

- *ezdxf* is a Python package to create new DXF files and read/modify/write
- `ezdxf` is a Python package to create new DXF files and read/modify/write
existing DXF documents
- MIT-License
- the intended audience are programmers
- requires at least Python 3.8
- requires at least Python 3.9
- OS independent
- tested with CPython and pypy3
- has type annotations and passes `mypy --ignore-missing-imports -p ezdxf` successful
- additional required packages for the core package without add-ons:
[typing_extensions](https://pypi.org/project/typing-extensions/),
[pyparsing](https://pypi.org/project/pyparsing/),
[numpy](https://pypi.org/project/numpy/),
[fontTools](https://pypi.org/project/fonttools/)
- additional required packages for the core package without add-ons
- [typing_extensions](https://pypi.org/project/typing-extensions/)
- [pyparsing](https://pypi.org/project/pyparsing/)
- [numpy](https://pypi.org/project/numpy/)
- [fontTools](https://pypi.org/project/fonttools/)
- read/write/new support for DXF versions: R12, R2000, R2004, R2007, R2010, R2013 and R2018
- additional read-only support for DXF versions R13/R14 (upgraded to R2000)
- additional read-only support for older DXF versions than R12 (upgraded to R12)
Expand All @@ -38,8 +35,7 @@ Quick-Info
on [PyPI](https://pypi.org/project/ezdxf/) for Windows, Linux and macOS
- command line script `ezdxf` to display, convert and inspect DXF files

Included Extensions
-------------------
## Included Extensions

Additional packages required for these add-ons are not automatically installed
during the *basic* setup, for more information about the setup & dependencies
Expand Down Expand Up @@ -114,8 +110,7 @@ The r12writer supports only the ENTITIES section of a DXF R12 drawing, no HEADER
TABLES or BLOCKS section is present, except FIXED-TABLES are written, than some
additional predefined text styles and line types are available.

Installation
------------
## Installation

Basic installation by pip including the optional C-extensions from PyPI as
binary wheels:
Expand All @@ -130,8 +125,7 @@ drawing add-on:
For more information about the setup & dependencies visit the
[documentation](https://ezdxf.mozman.at/docs/setup.html).

Command Line
------------
## Command Line

Use `python -m ezdxf ...` if your shell can't find the `ezdxf` script.

Expand Down Expand Up @@ -164,29 +158,33 @@ Preview and convert HPGL/2 plot files:
ezdxf hpgl <file.plt>


Website
-------
## Website

https://ezdxf.mozman.at/

Documentation
-------------
## Documentation

Documentation of the development version at https://ezdxf.mozman.at/docs

Documentation of the latest release at https://ezdxf.readthedocs.io/

Contribution
------------
## Knowledge Graph

The knowledge graph contains additional information beyond the documentation and is
managed by [logseq](https://logseq.com/). The source data is included in the repository
in the folder `ezdxf/notes`. There is also a [HTML export](https://ezdxf.mozman.at/notes/#/page/ezdxf)
on the website which gets regular updates.


## Contribution

The source code of *ezdxf* can be found at __GitHub__, target your pull requests
to the `master` branch:

https://github.com/mozman/ezdxf.git


Feedback
--------
## Feedback

Questions and feedback at __GitHub Discussions__:

Expand All @@ -200,8 +198,18 @@ Issue tracker at __GitHub__:

http://github.com/mozman/ezdxf/issues

Contact
-------
## Release Notes

The [release notes](https://ezdxf.mozman.at/notes/#/page/release%20notes) are included
in the knowledge graph.

## Changelog

The [changelog](https://ezdxf.mozman.at/notes/#/page/changelog) is included
in the knowledge graph.


## Contact

Please __always__ post questions at the [forum](https://github.com/mozman/ezdxf/discussions)
or [stack overflow](https://stackoverflow.com/) to make answers
Expand Down
Loading

0 comments on commit b7853f3

Please sign in to comment.