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

Update version for 1.1.4 release + clean obsoletes #692

Merged
merged 2 commits into from
Jun 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/python.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.6, 3.7, 3.8, 3.9, '3.10']
python-version: [3.7, 3.8, 3.9, '3.10']

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ node_js:
- 16
- 14
- 12
- 10

os:
- linux
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 8 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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)。
AntonOfTheWoods marked this conversation as resolved.
Show resolved Hide resolved
* 移除针对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日
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "opencc",
"version": "1.1.3",
"version": "1.1.4",
"description": "Conversion between Traditional and Simplified Chinese",
"author": "Carbo Kuo <byvoid@byvoid.com>",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion release-pypi-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion release-pypi-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion release-pypi-windows.cmd
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down