Skip to content

Commit

Permalink
Python 3.11.3に更新する (#662)
Browse files Browse the repository at this point in the history
* python 3.10.10

* poetry lock --no-update

* update requirements*.txt for python 3.10

* pip-licenses = "^4.2.0"

fix TypeError: PrettyTable._format_rows() takes 2 positional arguments but 3 were given

* update requirements*.txt for pip-licenses update

* add cython license

* add markupsafe license

* update cython

* update requirements*.txt for cython update

* remove cython license (cython update fixed automatic license detection)

* update markupsafe

* update requirements*.txt for markupsafe update

* remove markupsafe license (markupsafe update fixed automatic license detection)

* python 3.11.2

* poetry lock --no-update

* use py310 for pysen (py311 not supported yet)

* update requirements*.txt for python 3.11

* specify cython>=0.29.33

* cython = "^0.29.34,>=0.29.33"

* add todo comment about pysen py_version py310

* docker: update pyenv to 2.3.17

* docker: update pyenv dependencies

* python 3.11.3

* pyproject.toml: cython version lock comment for python 3.11

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>

---------

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>
  • Loading branch information
2 people authored and takana-v committed Sep 17, 2023
1 parent df01f98 commit 777f98d
Show file tree
Hide file tree
Showing 12 changed files with 1,074 additions and 848 deletions.
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.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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,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 @@ -93,7 +93,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
1,117 changes: 661 additions & 456 deletions poetry.lock

Large diffs are not rendered by default.

14 changes: 7 additions & 7 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 <hihokaruta@gmail.com>"]

[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 @@ -51,12 +51,12 @@ pyworld = "^0.3.0"
appdirs = "^1.4.4"
requests = "^2.28.1"
jinja2 = "^3.1.2"
pyopenjtalk = {git = "https://github.com/VOICEVOX/pyopenjtalk", rev = "f4ade29ef9a4f43d8605103cb5bacc29e0b2ccae"}
espnet = {git = "https://github.com/voicevox-bridge/espnet", rev = "d7633eb0eec9b00646847abdee3d34e5a62d2dea"}
pyopenjtalk = {git = "https://github.com/VOICEVOX/pyopenjtalk", rev = "b35fc89fe42948a28e33aed886ea145a51113f88"}
espnet = {git = "https://github.com/voicevox-bridge/espnet", rev = "788d58bd849a93c7a92aa694af4142a812d9334b"}
semver = "^3.0.1"

[tool.poetry.group.dev.dependencies]
cython = "^0.29.24"
cython = "^0.29.34,>=0.29.33" # NOTE: for Python 3.11
pre-commit = "^2.16.0"
atomicwrites = "^1.4.0"
colorama = "^0.4.4"
Expand All @@ -74,7 +74,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
241 changes: 122 additions & 119 deletions requirements-dev.txt

Large diffs are not rendered by default.

163 changes: 85 additions & 78 deletions requirements-license.txt
Original file line number Diff line number Diff line change
@@ -1,78 +1,85 @@
aiofiles==0.7.0 ; 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"
audioread==3.0.0 ; 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"
charset-normalizer==2.1.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
ci-sdr==0.0.2 ; 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" and platform_system == "Windows"
configargparse==1.5.3 ; python_full_version >= "3.8.1" and python_version < "3.9"
ctc-segmentation==1.7.4 ; python_full_version >= "3.8.1" and python_version < "3.9"
cython==0.29.24 ; python_full_version >= "3.8.1" and python_version < "3.9"
decorator==5.1.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
distance==0.1.3 ; python_full_version >= "3.8.1" and python_version < "3.9"
einops==0.6.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
espnet @ git+https://github.com/voicevox-bridge/espnet@d7633eb0eec9b00646847abdee3d34e5a62d2dea ; python_full_version >= "3.8.1" and python_version < "3.9"
espnet-tts-frontend==0.0.3 ; 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"
g2p-en==2.1.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
h11==0.14.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
h5py==3.7.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
humanfriendly==10.0 ; 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"
inflect==6.0.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
jaconv==0.3.3 ; python_full_version >= "3.8.1" and python_version < "3.9"
jamo==0.4.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
jinja2==3.1.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
joblib==1.2.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
librosa==0.9.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
llvmlite==0.39.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
markupsafe==2.1.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
nltk==3.8.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
numba==0.56.4 ; python_full_version >= "3.8.1" and python_version < "3.9"
numpy==1.20.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
nvidia-cublas-cu11==11.10.3.66 ; python_full_version >= "3.8.1" and python_version < "3.9" and platform_system == "Linux"
nvidia-cuda-nvrtc-cu11==11.7.99 ; python_full_version >= "3.8.1" and python_version < "3.9" and platform_system == "Linux"
nvidia-cuda-runtime-cu11==11.7.99 ; python_full_version >= "3.8.1" and python_version < "3.9" and platform_system == "Linux"
nvidia-cudnn-cu11==8.5.0.96 ; python_full_version >= "3.8.1" and python_version < "3.9" and platform_system == "Linux"
packaging==22.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
pip-licenses==3.5.5 ; python_full_version >= "3.8.1" and python_version < "3.9"
pooch==1.6.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
ptable==0.9.2 ; 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"
pyopenjtalk @ git+https://github.com/VOICEVOX/pyopenjtalk@f4ade29ef9a4f43d8605103cb5bacc29e0b2ccae ; python_full_version >= "3.8.1" and python_version < "3.9"
pypinyin==0.44.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
pyreadline3==3.4.1 ; sys_platform == "win32" and 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"
pytorch-wpe==0.0.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
pyworld==0.3.0 ; 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"
regex==2022.10.31 ; 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"
resampy==0.4.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
scikit-learn==1.2.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
scipy==1.7.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
semver==3.0.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
sentencepiece==0.1.97 ; 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"
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"
threadpoolctl==3.1.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
torch-complex==0.4.3 ; python_full_version >= "3.8.1" and python_version < "3.9"
torch==1.13.1 ; 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"
typeguard==2.13.3 ; 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"
unidecode==1.3.6 ; 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"
wheel==0.38.4 ; python_full_version >= "3.8.1" and python_version < "3.9" and platform_system == "Linux"
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"
antlr4-python3-runtime==4.9.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"
asteroid-filterbanks==0.4.0 ; python_version >= "3.11" and python_version < "3.12"
audioread==3.0.0 ; 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"
charset-normalizer==2.1.1 ; python_version >= "3.11" and python_version < "3.12"
ci-sdr==0.0.2 ; 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" and platform_system == "Windows"
configargparse==1.5.3 ; python_version >= "3.11" and python_version < "3.12"
ctc-segmentation==1.7.4 ; python_version >= "3.11" and python_version < "3.12"
cython==0.29.36 ; python_version >= "3.11" and python_version < "3.12"
decorator==5.1.1 ; python_version >= "3.11" and python_version < "3.12"
distance==0.1.3 ; python_version >= "3.11" and python_version < "3.12"
editdistance==0.6.2 ; python_version >= "3.11" and python_version < "3.12"
einops==0.6.0 ; python_version >= "3.11" and python_version < "3.12"
espnet @ git+https://github.com/voicevox-bridge/espnet@788d58bd849a93c7a92aa694af4142a812d9334b ; python_version >= "3.11" and python_version < "3.12"
espnet-tts-frontend==0.0.3 ; python_version >= "3.11" and python_version < "3.12"
fast-bss-eval==0.1.3 ; 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"
g2p-en==2.1.0 ; python_version >= "3.11" and python_version < "3.12"
h11==0.14.0 ; python_version >= "3.11" and python_version < "3.12"
h5py==3.9.0 ; python_version >= "3.11" and python_version < "3.12"
humanfriendly==10.0 ; python_version >= "3.11" and python_version < "3.12"
hydra-core==1.3.2 ; 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"
inflect==6.0.2 ; python_version >= "3.11" and python_version < "3.12"
jaconv==0.3.3 ; python_version >= "3.11" and python_version < "3.12"
jamo==0.4.1 ; python_version >= "3.11" and python_version < "3.12"
jinja2==3.1.2 ; python_version >= "3.11" and python_version < "3.12"
joblib==1.2.0 ; python_version >= "3.11" and python_version < "3.12"
librosa==0.9.2 ; python_version >= "3.11" and python_version < "3.12"
llvmlite==0.40.1 ; python_version >= "3.11" and python_version < "3.12"
markupsafe==2.1.3 ; python_version >= "3.11" and python_version < "3.12"
mpmath==1.3.0 ; python_version >= "3.11" and python_version < "3.12"
networkx==3.1 ; python_version >= "3.11" and python_version < "3.12"
nltk==3.8.1 ; python_version >= "3.11" and python_version < "3.12"
numba==0.57.1 ; python_version >= "3.11" and python_version < "3.12"
numpy==1.24.4 ; python_version >= "3.11" and python_version < "3.12"
omegaconf==2.3.0 ; python_version >= "3.11" and python_version < "3.12"
opt-einsum==3.3.0 ; python_version >= "3.11" and python_version < "3.12"
packaging==22.0 ; python_version >= "3.11" and python_version < "3.12"
pip-licenses==4.3.2 ; python_version >= "3.11" and python_version < "3.12"
pooch==1.6.0 ; python_version >= "3.11" and python_version < "3.12"
prettytable==3.9.0 ; python_version >= "3.11" and python_version < "3.12"
protobuf==3.20.1 ; 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"
pyopenjtalk @ git+https://github.com/VOICEVOX/pyopenjtalk@b35fc89fe42948a28e33aed886ea145a51113f88 ; python_version >= "3.11" and python_version < "3.12"
pypinyin==0.44.0 ; python_version >= "3.11" and python_version < "3.12"
pyreadline3==3.4.1 ; sys_platform == "win32" and python_version >= "3.11" and python_version < "3.12"
python-multipart==0.0.5 ; python_version >= "3.11" and python_version < "3.12"
pytorch-wpe==0.0.1 ; python_version >= "3.11" and python_version < "3.12"
pyworld==0.3.4 ; python_version >= "3.11" and python_version < "3.12"
pyyaml==6.0 ; python_version >= "3.11" and python_version < "3.12"
regex==2022.10.31 ; python_version >= "3.11" and python_version < "3.12"
requests==2.28.1 ; python_version >= "3.11" and python_version < "3.12"
resampy==0.3.1 ; python_version >= "3.11" and python_version < "3.12"
scikit-learn==1.2.0 ; python_version >= "3.11" and python_version < "3.12"
scipy==1.10.1 ; python_version >= "3.11" and python_version < "3.12"
semver==3.0.1 ; python_version >= "3.11" and python_version < "3.12"
sentencepiece==0.1.99 ; python_version >= "3.11" and python_version < "3.12"
setuptools==65.6.3 ; 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"
sympy==1.12 ; python_version >= "3.11" and python_version < "3.12"
threadpoolctl==3.1.0 ; python_version >= "3.11" and python_version < "3.12"
torch-complex==0.4.3 ; python_version >= "3.11" and python_version < "3.12"
torch==2.0.1 ; python_version >= "3.11" and python_version < "3.12"
tqdm==4.64.1 ; python_version >= "3.11" and python_version < "3.12"
typeguard==2.13.3 ; python_version >= "3.11" and python_version < "3.12"
typing-extensions==4.4.0 ; python_version >= "3.11" and python_version < "3.12"
unidecode==1.3.6 ; 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"
wcwidth==0.2.6 ; python_version >= "3.11" and python_version < "3.12"
zipp==3.11.0 ; python_version >= "3.11" and python_version < "3.12"
Loading

0 comments on commit 777f98d

Please sign in to comment.