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

Python 3.11.3に更新する #662

Merged
merged 25 commits into from
Apr 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c210b6a
python 3.10.10
aoirint Apr 14, 2023
7317d72
poetry lock --no-update
aoirint Apr 15, 2023
689ec06
update requirements*.txt for python 3.10
aoirint Apr 15, 2023
354ceb6
pip-licenses = "^4.2.0"
aoirint Apr 15, 2023
9f1f6cd
update requirements*.txt for pip-licenses update
aoirint Apr 15, 2023
233505e
add cython license
aoirint Apr 15, 2023
f5b9ec3
add markupsafe license
aoirint Apr 15, 2023
5eea98f
update cython
aoirint Apr 15, 2023
42b0eed
update requirements*.txt for cython update
aoirint Apr 15, 2023
ef95834
remove cython license (cython update fixed automatic license detection)
aoirint Apr 15, 2023
155ee7a
update markupsafe
aoirint Apr 15, 2023
edb88aa
update requirements*.txt for markupsafe update
aoirint Apr 15, 2023
4c87889
remove markupsafe license (markupsafe update fixed automatic license …
aoirint Apr 15, 2023
529f1e1
python 3.11.2
aoirint Apr 14, 2023
42d6612
poetry lock --no-update
aoirint Apr 15, 2023
011d22c
use py310 for pysen (py311 not supported yet)
aoirint Apr 14, 2023
67bd55e
update requirements*.txt for python 3.11
aoirint Apr 15, 2023
e5b98ab
specify cython>=0.29.33
aoirint Apr 15, 2023
09c0339
cython = "^0.29.34,>=0.29.33"
aoirint Apr 15, 2023
b02d36f
add todo comment about pysen py_version py310
aoirint Apr 15, 2023
5fa7072
Merge remote-tracking branch 'upstream/master' into patch-python-3.11
aoirint Apr 15, 2023
0432190
docker: update pyenv to 2.3.17
aoirint Apr 15, 2023
b186f53
docker: update pyenv dependencies
aoirint Apr 15, 2023
5381a47
python 3.11.3
aoirint Apr 16, 2023
6e71569
pyproject.toml: cython version lock comment for python 3.11
aoirint Apr 16, 2023
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/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

env:
IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/voicevox_engine
PYTHON_VERSION: "3.8.10"
PYTHON_VERSION: "3.11.3"
VOICEVOX_RESOURCE_VERSION: "0.14.2"
VOICEVOX_CORE_VERSION: "0.14.3"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
type: boolean

env:
PYTHON_VERSION: "3.8.10"
PYTHON_VERSION: "3.11.3"
VOICEVOX_RESOURCE_VERSION: "0.14.2"
VOICEVOX_CORE_VERSION: "0.14.3"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-test-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
#
- uses: actions/setup-python@v2
with:
python-version: "3.8.10"
python-version: "3.11.3"
cache: pip

- name: Install libsndfile1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:

- uses: actions/setup-python@v2
with:
python-version: "3.8.10"
python-version: "3.11.3"
cache: pip

- name: Download
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04, windows-latest] # [ubuntu-20.04, macos-latest, windows-latest]
python: ["3.8.10"]
python: ["3.11.3"]
include:
- os: ubuntu-20.04
path: ~/.cache/pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upload-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- "master"

env:
PYTHON_VERSION: "3.8.10"
PYTHON_VERSION: "3.11.3"
PUBLISH_DIR: "./docs/api"
PUBLISH_BRANCH: "gh-pages"
DESTINATION_DIR: "api"
Expand Down
10 changes: 4 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -135,23 +135,21 @@ RUN <<EOF
libbz2-dev \
libreadline-dev \
libsqlite3-dev \
wget \
curl \
llvm \
libncurses5-dev \
libncursesw5-dev \
xz-utils \
tk-dev \
libxml2-dev \
libxmlsec1-dev \
libffi-dev \
liblzma-dev \
python-openssl \
git
apt-get clean
rm -rf /var/lib/apt/lists/*
EOF

ARG PYTHON_VERSION=3.8.10
ARG PYENV_VERSION=v2.3.7
ARG PYTHON_VERSION=3.11.3
ARG PYENV_VERSION=v2.3.17
ARG PYENV_ROOT=/tmp/.pyenv
ARG PYBUILD_ROOT=/tmp/python-build
RUN <<EOF
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ Issue 側で取り組み始めたことを伝えるか、最初に Draft プル

## 環境構築

`Python 3.8.10` を用いて開発されています。
`Python 3.11.3` を用いて開発されています。
インストールするには、各 OS ごとの C/C++ コンパイラ、CMake が必要になります。

```bash
Expand Down
2 changes: 1 addition & 1 deletion generate_licenses.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def generate_licenses() -> List[License]:
)

# Python
python_version = "3.8.10"
python_version = "3.11.3"
with urllib.request.urlopen(
f"https://raw.githubusercontent.com/python/cpython/v{python_version}/LICENSE"
) as res:
Expand Down
267 changes: 123 additions & 144 deletions poetry.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ enable_isort = true
enable_mypy = false # TODO: eliminate errors and enable at CI
mypy_preset = "entry" # TODO: "strict"
line_length = 88
py_version = "py38"
py_version = "py310" # TODO: update to py311 after pysen supports Python 3.11
isort_known_first_party = ["voicevox_engine"]
isort_known_third_party = ["numpy"]
[[tool.pysen.lint.mypy_targets]]
paths = [".", "voicevox_engine/"]

[tool.black] # automatically generated by pysen
line-length = 88
target-version = ["py38"]
target-version = ["py310"] # TODO: update to py311 after pysen supports Python 3.11


[tool.isort] # automatically generated by pysen
Expand All @@ -38,7 +38,7 @@ description = ""
authors = ["Hiroshiba <[email protected]>"]

[tool.poetry.dependencies]
python = "~3.8,>=3.8.1"
python = "~3.11"
numpy = "^1.20.0"
fastapi = "^0.70.0"
python-multipart = "^0.0.5"
Expand All @@ -55,7 +55,7 @@ pyopenjtalk = {git = "https://github.com/VOICEVOX/pyopenjtalk", rev = "827a3fc5c
semver = "^3.0.0"

[tool.poetry.group.dev.dependencies]
cython = "^0.29.24"
cython = "^0.29.34,>=0.29.33" # NOTE: for Python 3.11
pyinstaller = "^5.6,<5.7.0" # NOTE: 5.7.0 or higher will fail to build the bootloader.
pre-commit = "^2.16.0"
atomicwrites = "^1.4.0"
Expand All @@ -73,7 +73,7 @@ pytest = "^6.2.5"
coveralls = "^3.2.0"

[tool.poetry.group.license.dependencies]
pip-licenses = "^3.5.3"
pip-licenses = "^4.2.0"

[build-system]
requires = ["poetry-core"]
Expand Down
169 changes: 83 additions & 86 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,86 +1,83 @@
aiofiles==0.7.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
altgraph==0.17.3 ; python_full_version >= "3.8.1" and python_version < "3.9"
anyio==3.6.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
appdirs==1.4.4 ; python_full_version >= "3.8.1" and python_version < "3.9"
asgiref==3.6.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
atomicwrites==1.4.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
attrs==22.2.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
cachecontrol[filecache]==0.12.11 ; python_full_version >= "3.8.1" and python_version < "3.9"
certifi==2022.12.7 ; python_full_version >= "3.8.1" and python_version < "3.9"
cffi==1.15.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
cfgv==3.3.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
charset-normalizer==2.1.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
cleo==2.0.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
click==8.0.4 ; python_full_version >= "3.8.1" and python_version < "3.9"
colorama==0.4.4 ; python_full_version >= "3.8.1" and python_version < "3.9"
crashtest==0.4.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
cryptography==39.0.0 ; python_full_version >= "3.8.1" and python_version < "3.9" and sys_platform == "linux"
cython==0.29.24 ; python_full_version >= "3.8.1" and python_version < "3.9"
distlib==0.3.6 ; python_full_version >= "3.8.1" and python_version < "3.9"
dulwich==0.20.50 ; python_full_version >= "3.8.1" and python_version < "3.9"
fastapi==0.70.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
filelock==3.8.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
future==0.18.2 ; python_full_version >= "3.8.1" and python_version < "3.9" and sys_platform == "win32"
h11==0.14.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
html5lib==1.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
identify==2.5.11 ; python_full_version >= "3.8.1" and python_version < "3.9"
idna==3.4 ; python_full_version >= "3.8.1" and python_version < "3.9"
importlib-metadata==4.13.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
importlib-resources==5.10.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
jaraco-classes==3.2.3 ; python_full_version >= "3.8.1" and python_version < "3.9"
jeepney==0.8.0 ; python_full_version >= "3.8.1" and python_version < "3.9" and sys_platform == "linux"
jinja2==3.1.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
jsonschema==4.17.3 ; python_full_version >= "3.8.1" and python_version < "3.9"
keyring==23.13.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
lockfile==0.12.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
macholib==1.16.2 ; python_full_version >= "3.8.1" and python_version < "3.9" and sys_platform == "darwin"
markupsafe==2.1.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
more-itertools==9.0.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
msgpack==1.0.4 ; python_full_version >= "3.8.1" and python_version < "3.9"
nodeenv==1.7.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
numpy==1.24.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
packaging==22.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
pefile==2022.5.30 ; python_full_version >= "3.8.1" and python_version < "3.9" and sys_platform == "win32"
pexpect==4.8.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
pkginfo==1.9.4 ; python_full_version >= "3.8.1" and python_version < "3.9"
pkgutil-resolve-name==1.3.10 ; python_full_version >= "3.8.1" and python_version < "3.9"
platformdirs==2.6.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
poetry-core==1.4.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
poetry-plugin-export==1.2.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
poetry==1.3.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
pre-commit==2.16.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
ptyprocess==0.7.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
pycparser==2.21 ; python_full_version >= "3.8.1" and python_version < "3.9"
pydantic==1.10.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
pyinstaller-hooks-contrib==2022.14 ; python_full_version >= "3.8.1" and python_version < "3.9"
pyinstaller==5.6.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
pyopenjtalk @ git+https://github.com/VOICEVOX/pyopenjtalk@827a3fc5c7dda7bbe832c0c69da98e39cc8cb2c3 ; python_full_version >= "3.8.1" and python_version < "3.9"
pyrsistent==0.19.3 ; python_full_version >= "3.8.1" and python_version < "3.9"
python-multipart==0.0.5 ; python_full_version >= "3.8.1" and python_version < "3.9"
pywin32-ctypes==0.2.0 ; python_full_version >= "3.8.1" and python_version < "3.9" and sys_platform == "win32"
pyworld==0.3.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
pyyaml==6.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
rapidfuzz==2.13.7 ; python_full_version >= "3.8.1" and python_version < "3.9"
requests-toolbelt==0.10.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
requests==2.28.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
scipy==1.10.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
secretstorage==3.3.3 ; python_full_version >= "3.8.1" and python_version < "3.9" and sys_platform == "linux"
semver==3.0.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
setuptools==65.6.3 ; python_full_version >= "3.8.1" and python_version < "3.9"
shellingham==1.5.0.post1 ; python_full_version >= "3.8.1" and python_version < "3.9"
six==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
sniffio==1.3.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
soundfile==0.10.3.post1 ; python_full_version >= "3.8.1" and python_version < "3.9"
starlette==0.16.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
toml==0.10.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
tomli==2.0.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
tomlkit==0.11.6 ; python_full_version >= "3.8.1" and python_version < "3.9"
tqdm==4.64.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
trove-classifiers==2022.12.22 ; python_full_version >= "3.8.1" and python_version < "3.9"
typing-extensions==4.4.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
urllib3==1.26.13 ; python_full_version >= "3.8.1" and python_version < "3.9"
uvicorn==0.15.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
virtualenv==20.17.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
webencodings==0.5.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
xattr==0.10.1 ; python_full_version >= "3.8.1" and python_version < "3.9" and sys_platform == "darwin"
zipp==3.11.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
aiofiles==0.7.0 ; python_version >= "3.11" and python_version < "3.12"
altgraph==0.17.3 ; python_version >= "3.11" and python_version < "3.12"
anyio==3.6.2 ; python_version >= "3.11" and python_version < "3.12"
appdirs==1.4.4 ; python_version >= "3.11" and python_version < "3.12"
asgiref==3.6.0 ; python_version >= "3.11" and python_version < "3.12"
atomicwrites==1.4.0 ; python_version >= "3.11" and python_version < "3.12"
attrs==22.2.0 ; python_version >= "3.11" and python_version < "3.12"
cachecontrol[filecache]==0.12.11 ; python_version >= "3.11" and python_version < "3.12"
certifi==2022.12.7 ; python_version >= "3.11" and python_version < "3.12"
cffi==1.15.1 ; python_version >= "3.11" and python_version < "3.12"
cfgv==3.3.1 ; python_version >= "3.11" and python_version < "3.12"
charset-normalizer==2.1.1 ; python_version >= "3.11" and python_version < "3.12"
cleo==2.0.1 ; python_version >= "3.11" and python_version < "3.12"
click==8.0.4 ; python_version >= "3.11" and python_version < "3.12"
colorama==0.4.4 ; python_version >= "3.11" and python_version < "3.12"
crashtest==0.4.1 ; python_version >= "3.11" and python_version < "3.12"
cryptography==39.0.0 ; python_version >= "3.11" and python_version < "3.12" and sys_platform == "linux"
cython==0.29.34 ; python_version >= "3.11" and python_version < "3.12"
distlib==0.3.6 ; python_version >= "3.11" and python_version < "3.12"
dulwich==0.20.50 ; python_version >= "3.11" and python_version < "3.12"
fastapi==0.70.0 ; python_version >= "3.11" and python_version < "3.12"
filelock==3.8.2 ; python_version >= "3.11" and python_version < "3.12"
future==0.18.2 ; python_version >= "3.11" and python_version < "3.12" and sys_platform == "win32"
h11==0.14.0 ; python_version >= "3.11" and python_version < "3.12"
html5lib==1.1 ; python_version >= "3.11" and python_version < "3.12"
identify==2.5.11 ; python_version >= "3.11" and python_version < "3.12"
idna==3.4 ; python_version >= "3.11" and python_version < "3.12"
importlib-metadata==4.13.0 ; python_version >= "3.11" and python_version < "3.12"
jaraco-classes==3.2.3 ; python_version >= "3.11" and python_version < "3.12"
jeepney==0.8.0 ; python_version >= "3.11" and python_version < "3.12" and sys_platform == "linux"
jinja2==3.1.2 ; python_version >= "3.11" and python_version < "3.12"
jsonschema==4.17.3 ; python_version >= "3.11" and python_version < "3.12"
keyring==23.13.1 ; python_version >= "3.11" and python_version < "3.12"
lockfile==0.12.2 ; python_version >= "3.11" and python_version < "3.12"
macholib==1.16.2 ; python_version >= "3.11" and python_version < "3.12" and sys_platform == "darwin"
markupsafe==2.1.2 ; python_version >= "3.11" and python_version < "3.12"
more-itertools==9.0.0 ; python_version >= "3.11" and python_version < "3.12"
msgpack==1.0.4 ; python_version >= "3.11" and python_version < "3.12"
nodeenv==1.7.0 ; python_version >= "3.11" and python_version < "3.12"
numpy==1.24.2 ; python_version >= "3.11" and python_version < "3.12"
packaging==22.0 ; python_version >= "3.11" and python_version < "3.12"
pefile==2022.5.30 ; python_version >= "3.11" and python_version < "3.12" and sys_platform == "win32"
pexpect==4.8.0 ; python_version >= "3.11" and python_version < "3.12"
pkginfo==1.9.4 ; python_version >= "3.11" and python_version < "3.12"
platformdirs==2.6.2 ; python_version >= "3.11" and python_version < "3.12"
poetry-core==1.4.0 ; python_version >= "3.11" and python_version < "3.12"
poetry-plugin-export==1.2.0 ; python_version >= "3.11" and python_version < "3.12"
poetry==1.3.1 ; python_version >= "3.11" and python_version < "3.12"
pre-commit==2.16.0 ; python_version >= "3.11" and python_version < "3.12"
ptyprocess==0.7.0 ; python_version >= "3.11" and python_version < "3.12"
pycparser==2.21 ; python_version >= "3.11" and python_version < "3.12"
pydantic==1.10.2 ; python_version >= "3.11" and python_version < "3.12"
pyinstaller-hooks-contrib==2022.14 ; python_version >= "3.11" and python_version < "3.12"
pyinstaller==5.6.2 ; python_version >= "3.11" and python_version < "3.12"
pyopenjtalk @ git+https://github.com/VOICEVOX/pyopenjtalk@827a3fc5c7dda7bbe832c0c69da98e39cc8cb2c3 ; python_version >= "3.11" and python_version < "3.12"
pyrsistent==0.19.3 ; python_version >= "3.11" and python_version < "3.12"
python-multipart==0.0.5 ; python_version >= "3.11" and python_version < "3.12"
pywin32-ctypes==0.2.0 ; python_version >= "3.11" and python_version < "3.12" and sys_platform == "win32"
pyworld==0.3.2 ; python_version >= "3.11" and python_version < "3.12"
pyyaml==6.0 ; python_version >= "3.11" and python_version < "3.12"
rapidfuzz==2.13.7 ; python_version >= "3.11" and python_version < "3.12"
requests-toolbelt==0.10.1 ; python_version >= "3.11" and python_version < "3.12"
requests==2.28.1 ; python_version >= "3.11" and python_version < "3.12"
scipy==1.10.1 ; python_version >= "3.11" and python_version < "3.12"
secretstorage==3.3.3 ; python_version >= "3.11" and python_version < "3.12" and sys_platform == "linux"
semver==3.0.0 ; python_version >= "3.11" and python_version < "3.12"
setuptools==65.6.3 ; python_version >= "3.11" and python_version < "3.12"
shellingham==1.5.0.post1 ; python_version >= "3.11" and python_version < "3.12"
six==1.16.0 ; python_version >= "3.11" and python_version < "3.12"
sniffio==1.3.0 ; python_version >= "3.11" and python_version < "3.12"
soundfile==0.10.3.post1 ; python_version >= "3.11" and python_version < "3.12"
starlette==0.16.0 ; python_version >= "3.11" and python_version < "3.12"
toml==0.10.2 ; python_version >= "3.11" and python_version < "3.12"
tomlkit==0.11.6 ; python_version >= "3.11" and python_version < "3.12"
tqdm==4.64.1 ; python_version >= "3.11" and python_version < "3.12"
trove-classifiers==2022.12.22 ; python_version >= "3.11" and python_version < "3.12"
typing-extensions==4.4.0 ; python_version >= "3.11" and python_version < "3.12"
urllib3==1.26.13 ; python_version >= "3.11" and python_version < "3.12"
uvicorn==0.15.0 ; python_version >= "3.11" and python_version < "3.12"
virtualenv==20.17.1 ; python_version >= "3.11" and python_version < "3.12"
webencodings==0.5.1 ; python_version >= "3.11" and python_version < "3.12"
xattr==0.10.1 ; python_version >= "3.11" and python_version < "3.12" and sys_platform == "darwin"
zipp==3.11.0 ; python_version >= "3.11" and python_version < "3.12"
Loading