Skip to content

feat: Support python 3.12 #113

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.

Sign up for GitHub

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

Merged
zhongjiajie merged 4 commits into from
Oct 13, 2023
Merged

feat: Support python 3.12 #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6850833
chore: Support python 3.12
zhongjiajie Oct 12, 2023
24b6a7a
add module compatible
zhongjiajie Oct 12, 2023
09ca378
fix pkg_resources is remove in py312
zhongjiajie Oct 13, 2023
c8b06ef
remove .DS_Store in gitignore
zhongjiajie Oct 13, 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
4 changes: 3 additions & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
matrix:
# YAML parse `3.10` to `3.1`, so we have to add quotes for `'3.10'`, see also:
# https://github.com/actions/setup-python/issues/160#issuecomment-724485470
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
# FIXME: temp change os to ubuntu-20.04 to fix python can not found error https://github.com/actions/setup-python/issues/162#issuecomment-1325307787
os: [ubuntu-20.04, macOS-latest, windows-latest]
# Skip because dependence [py4j](https://pypi.org/project/py4j/) not work on those environments
Expand All @@ -85,6 +85,8 @@ jobs:
python-version: '3.10'
- os: windows-latest
python-version: 3.11
- os: windows-latest
python-version: 3.12
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ run tests. And it is scattered commands to reproduce each step of the integratio
### With GitHub Action

GitHub Action test in various environment for pydolphinscheduler, including different python version in
`3.6|3.7|3.8|3.9|3.10|3.11` and operating system `linux|macOS|windows`. It will trigger and run automatically when you
`3.6|3.7|3.8|3.9|3.10|3.11|3.12` and operating system `linux|macOS|windows`. It will trigger and run automatically when you
submit pull requests to repository `apache/dolphinscheduler-sdk-python`.

### Automated Testing With tox
Expand Down Expand Up @@ -214,7 +214,7 @@ make clean && make multiversion
## Unit Test

pydolphinscheduler using [pytest][pytest] to test our codebase. GitHub Action will run our test when you create
pull request or commit to dev branch, with python version `3.6|3.7|3.8|3.9|3.10|3.11` and operating system `linux|macOS|windows`.
pull request or commit to dev branch, with python version `3.6|3.7|3.8|3.9|3.10|3.11|3.12` and operating system `linux|macOS|windows`.

### Unit Test Using tox

Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ classifiers =
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: Implementation :: PyPy
Topic :: Software Development :: User Interfaces
Expand Down Expand Up @@ -202,7 +203,7 @@ envlist =
code-test
integrate-test
local-integrate-test
py{36,37,38,39,310,311}
py{36,37,38,39,310,311,312}

[testenv]
allowlist_externals =
Expand Down
13 changes: 5 additions & 8 deletions src/pydolphinscheduler/utils/versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@

from pathlib import Path

from packaging import requirements
from packaging.requirements import Requirement as packaging_Requirement
from packaging.version import InvalidVersion
from pkg_resources import parse_requirements

from pydolphinscheduler.constants import Version

Expand All @@ -34,13 +33,11 @@ def version_match(name: str, version: str) -> bool:
"""
path = Path(__file__).parent.parent.joinpath(Version.FILE_NAME)
with path.open() as match:
content = match.read()
for reqs in parse_requirements(content):
if reqs.name == name:
for line in match.readlines():
req = packaging_Requirement(line)
if req.name == name:
try:
return requirements.Requirement(str(reqs)).specifier.contains(
version
)
return req.specifier.contains(version)
except InvalidVersion:
return False
raise ValueError("%s is not in %s" % (name, Version.FILE_NAME))
4 changes: 3 additions & 1 deletion tests/utils/test_versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
@mock.patch("pathlib.Path.open")
def test_version_match(mock_open, content: str, name: str, version: str, expect: str):
"""Test function version_match."""
mock_open.return_value.__enter__.return_value.read.return_value = content
mock_open.return_value.__enter__.return_value.readlines.return_value = [
f"{content}\n"
]
assert version_match(name, version) == expect
assert mock_open.call_count == 1

Expand Down