Merge remote-tracking branch 'parent/master' into sync-fork

# Conflicts:
#	Makefile
#	Pipfile
#	Pipfile.lock
#	README.rst
#	dockerfiles/buildwheel.sh
#	dockerfiles/develop/Dockerfile
#	dockerfiles/slim/Dockerfile
#	pyproject.toml
#	requirements-dev.txt
#	setup.py
#	src/cchardet/version.py
#	src/tests/bench.py
#	tox.ini

Author: wbarnha

.github/workflows/build.yaml

@@ -0,0 +1,59 @@
+name: Build Wheels
+on:
+  push:
+    branches: [master]
+  create:
+  workflow_dispatch:
+
+jobs:
+  build_wheels:
+    strategy:
+      matrix:
+        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
+    runs-on: ${{ matrix.os }}
+    name: Build wheels on ${{ matrix.os }}
+
+    steps:
+      - name: Set up QEMU
+        if: runner.os == 'Linux'
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: all
+
+      - uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+          cache: "pip"
+
+      - name: Install dependencies
+        shell: bash
+        run: |
+          python -VV
+          pip install -r requirements-dev.txt
+
+      - name: Cythonize
+        shell: bash
+        run: |
+          python -VV
+          make cython
+
+      - name: Build
+        uses: pypa/cibuildwheel@v2.18.1
+        env:
+          # NOTICE: ローカルでは想定通りにテストは通るが､ cibuildwheel では 特定のファイルの文字コード検知がうまくいかないので一時的に無効化する
+          # CIBW_TEST_REQUIRES: "pytest"
+          # CIBW_TEST_COMMAND: "pytest {project}/tests"
+
+          CIBW_ARCHS_LINUX: auto aarch64
+          CIBW_ARCHS_MACOS: x86_64 universal2 arm64
+          CIBW_SKIP: pp* cp36-* cp37-* cp38-*
+
+      - name: Upload Wheels to artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-${{ matrix.os }}
+          path: wheelhouse

.github/workflows/test.yml

@@ -0,0 +1,53 @@
+name: Run tests
+on:
+  push:
+  pull_request:
+  create:
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
+        py: ["3.13-dev", "3.12", "3.11", "3.10", "3.9"]
+
+    runs-on: ${{ matrix.os }}
+    name: Run test with Python ${{ matrix.py }} on ${{ matrix.os }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.py }}
+          allow-prereleases: true
+          cache: "pip"
+
+      - name: Install dependencies
+        shell: bash
+        run: |
+          python -VV
+          pip install -r requirements-dev.txt
+
+      - name: Build
+        shell: bash
+        run: |
+          python -VV
+          make cython
+          pip install .
+
+      - name: Lint
+        shell: bash
+        run: |
+          python -VV
+          ruff check
+
+      - name: Test
+        shell: bash
+        run: |
+          python -VV
+          pytest -vs tests

.gitignore

@@ -46,3 +46,10 @@ None
 
 .DS_Store
 /.vscode/
+.pytest_cache
+.ruff_cache
+__pycache__
+.venv
+wheelhouse
+archives
+*.whl

CHANGES.md

@@ -0,0 +1,101 @@
+# CHANGES
+
+## 2.x.x
+
+## 2.2.0-alpha.2 (2024-06-xx)
+
+- Improve test codes and CI/CD workflows
+
+## 2.2.0-alpha.1 (2024-06-07)
+
+- support Python 3.10, 3.11, 3.12
+- drop support for Python 3.6, 3.7, 3.8
+- experimental support for arm64
+- improve some CI/CD workflows
+- migration from nose to pytest (#87)
+
+## 2.1.7 (2020-10-27)
+
+- support Python 3.9
+- drop support for Python 3.5
+
+## 2.1.6 (2020-03-17)
+
+- drop support for Python 2.7
+- support Github Actions
+- update dev-dependencies
+
+## 2.1.5 (2019-09-27)
+
+- update language models (uchardet)
+- add iso8859-2 test but disabled it
+- support Python 3.8
+- drop support for Python 3.4
+
+## 2.1.4 (2018-09-27)
+
+- disable LTO because become poor performance
+
+## 2.1.3 (2018-09-26)
+
+- support Python 3.7
+
+## 2.1.2 (2018-09-26)
+
+- enable [LTO](https://gcc.gnu.org/wiki/LinkTimeOptimization) for wheel builds
+- update Cython
+
+## 2.1.1 (2017-07-01)
+
+- fix that different results with different chuck sizes
+- fix that assignments to nsSMState in nsCodingStateMachine result in unspecified behavior
+- include COPYING in package
+
+## 2.1.0 (2017-05-15)
+
+- add cchardetect CLI script ([#30](https://github.com/PyYoshi/cChardet/pull/30))[\@craigds](https://github.com/craigds)
+
+## 2.0.1 (2017-04-25)
+
+- fix an issue where UTF-8 with a BOM would not be detected as UTF-8-SIG (fix [#28](https://github.com/PyYoshi/cChardet/issues/28))
+- pass NULL Byte to feed() / detect() (fix [#27](https://github.com/PyYoshi/cChardet/issues/27))
+
+## 2.0.0 (2017-04-06)
+
+- Improve tests
+
+## 2.0a4 (2017-04-05)
+
+- Update uchardet repo (Fix buffer overflow)
+
+## 2.0a3 (2017-03-29)
+
+- Implement UniversalDetector (like chardet)
+
+## 2.0a2 (2017-03-28)
+
+- Update uchardet repo (Fix memory leak)
+
+## 2.0a1 (2017-03-28)
+
+- Replace [uchardet-enhanced](https://bitbucket.org/medoc/uchardet-enhanced/overview) to [uchardet](https://github.com/PyYoshi/uchardet)
+- Remove Detector class
+
+## 1.1.3 (2017-02-26)
+
+- Support AArch64
+
+## 1.1.2 (2017-01-08)
+
+- Support Python 3.6
+
+## 1.1.1 (2016-11-05)
+
+- Use len() function (9e61cb9e96b138b0d18e5f9e013e144202ae4067)
+- Remove detect function in \_cchardet.pyx (25b581294fc0ae8f686ac9972c8549666766f695)
+- Support manylinux1 wheel
+
+## 1.1.0 (2016-10-17)
+
+- Add Detector class
+- Improve unit tests

CHANGES.rst

@@ -2,4 +2,4 @@ include *.txt
 include CHANGES.rst COPYING README.rst
 recursive-include src *.pyx *.pxd *.pxi *.py *.cpp
 recursive-include src/ext *
-recursive-include src/tests *
+recursive-include tests *