diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index a402c2184..e7f6ee7d0 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9, '3.10'] + python-version: [3.7, 3.8, 3.9, '3.10'] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/release-pypi.yml b/.github/workflows/release-pypi.yml index 27e0b2784..c9f6e91b3 100644 --- a/.github/workflows/release-pypi.yml +++ b/.github/workflows/release-pypi.yml @@ -19,7 +19,7 @@ jobs: docker run --rm -v "${PWD}:/opt/OpenCC" \ -e TWINE_USERNAME=__token__ \ -e TWINE_PASSWORD=${{ secrets.PYPI_TOKEN }} \ - ubuntu:16.04 /bin/bash /opt/OpenCC/release-pypi-linux.sh + ubuntu:18.04 /bin/bash /opt/OpenCC/release-pypi-linux.sh - name: Build package and upload (macOS) if: runner.os == 'macOS' diff --git a/.travis.yml b/.travis.yml index c9728ef68..2e7269cba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ node_js: - 16 - 14 - 12 - - 10 os: - linux diff --git a/CMakeLists.txt b/CMakeLists.txt index 07e374591..d2ae98773 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ set (PACKAGE_URL https://github.com/BYVoid/Opencc) set (PACKAGE_BUGREPORT https://github.com/BYVoid/Opencc/issues) set (OPENCC_VERSION_MAJOR 1) set (OPENCC_VERSION_MINOR 1) -set (OPENCC_VERSION_REVISION 3) +set (OPENCC_VERSION_REVISION 4) if (CMAKE_BUILD_TYPE MATCHES Debug) set (version_suffix .Debug) diff --git a/NEWS.md b/NEWS.md index 44c544fb0..1056b7937 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,13 @@ # Change History of OpenCC +## Version 1.1.4 + +2022年6月4日 + +* 支持Python 3.10([#637](https://github.com/BYVoid/OpenCC/issues/637)。 +* 移除针对Python 2.7、3.5、3.6和Node 10的构建([#690](https://github.com/BYVoid/OpenCC/issues/690), [#691](https://github.com/BYVoid/OpenCC/issues/691))。 +* 若干其他小修復。 + ## Version 1.1.3 2021年9月3日 diff --git a/package.json b/package.json index f64533698..d629b3fed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opencc", - "version": "1.1.3", + "version": "1.1.4", "description": "Conversion between Traditional and Simplified Chinese", "author": "Carbo Kuo ", "license": "Apache-2.0", diff --git a/release-pypi-linux.sh b/release-pypi-linux.sh index 6c3c41741..474800180 100644 --- a/release-pypi-linux.sh +++ b/release-pypi-linux.sh @@ -25,7 +25,7 @@ bash ${MINICONDA_FILENAME} -b -f -p $HOME/miniconda3 export PATH=$HOME/miniconda3/bin:$PATH eval "$(conda shell.bash hook)" -for VERSION in 3.5 3.6 3.7 3.8 3.9 3.10; do +for VERSION in 3.7 3.8 3.9 3.10; do # Create and activate environment conda create -y -n py$VERSION python=$VERSION conda activate py$VERSION diff --git a/release-pypi-macos.sh b/release-pypi-macos.sh index 7ceea1776..2862fbf4b 100644 --- a/release-pypi-macos.sh +++ b/release-pypi-macos.sh @@ -12,7 +12,7 @@ bash ${MINICONDA_FILENAME} -b -f -p $HOME/miniconda3 export PATH=$HOME/miniconda3/bin:$PATH eval "$(conda shell.bash hook)" -for VERSION in 3.5 3.6 3.7 3.8 3.9 3.10; do +for VERSION in 3.7 3.8 3.9 3.10; do # Create and activate environment conda create -y -n py$VERSION python=$VERSION conda activate py$VERSION diff --git a/release-pypi-windows.cmd b/release-pypi-windows.cmd index c267165ef..58dc2122f 100644 --- a/release-pypi-windows.cmd +++ b/release-pypi-windows.cmd @@ -1,7 +1,7 @@ @echo off setlocal EnableDelayedExpansion -SET VERSIONS=3.5 3.6 3.7 3.8 3.9 3.10 +SET VERSIONS=3.7 3.8 3.9 3.10 SET SOURCEDIR=%cd% REM Build packages diff --git a/setup.py b/setup.py index af52ba6ca..ed06259cd 100644 --- a/setup.py +++ b/setup.py @@ -202,7 +202,6 @@ def initialize_options(self): 'Natural Language :: Chinese (Simplified)', 'Natural Language :: Chinese (Traditional)', 'Programming Language :: Python', - 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 3', 'License :: OSI Approved :: Apache Software License', 'Topic :: Scientific/Engineering',