Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
luweizheng committed Jun 26, 2024
1 parent 941f3b9 commit 3121c19
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 50 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,8 @@ jobs:
python-version: ["3.8", "3.9", "3.10", "3.11"]
module: ["xoscar"]
exclude:
- { os: macos-latest, python-version: 3.8}
- { os: macos-latest, python-version: 3.9}
- { os: macos-latest, python-version: 3.10}
- { os: windows-latest, python-version: 3.8}
- { os: windows-latest, python-version: 3.9}
- { os: windows-latest, python-version: 3.10}
include:
Expand Down
5 changes: 5 additions & 0 deletions CI/requirements-wheel.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
oldest-supported-numpy

numpy<2.0.0
packaging
wheel

pandas==1.0.4; python_version<'3.9' and platform_machine!='aarch64' and platform_machine!='arm64'
pandas==1.1.3; python_version<'3.9' and platform_machine=='aarch64'
Expand All @@ -9,6 +12,7 @@ pandas==1.4.0; python_version>='3.9' and python_version<'3.10' and platform_mach
pandas==1.3.4; python_version>='3.10' and python_version<'3.11' and platform_machine!='arm64'
pandas==1.4.0; python_version>='3.10' and python_version<'3.11' and platform_machine=='arm64'
pandas==1.5.1; python_version>='3.11' and python_version<'3.12'
pandas>=2.1.1; python_version>'3.11'

scipy==1.4.1; python_version<'3.9' and platform_machine!='aarch64' and platform_machine!='arm64'
scipy==1.7.3; python_version<'3.9' and platform_machine=='arm64'
Expand All @@ -17,6 +21,7 @@ scipy==1.5.4; python_version>='3.9' and python_version<'3.10' and platform_machi
scipy==1.7.2; python_version>='3.10' and python_version<'3.11' and platform_machine!='arm64'
scipy==1.7.3; python_version>='3.10' and python_version<'3.11' and platform_machine=='arm64'
scipy==1.9.2; python_version>='3.11' and python_version<'3.12'
scipy>=1.11.2; python_version>'3.11'

# see: https://github.com/cython/cython/commit/afc00fc3ba5d43c67151c0039847a526e7b627a5
cython==0.29.33
Expand Down
20 changes: 18 additions & 2 deletions python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,24 @@ requires = [
"packaging",
"wheel",
"oldest-supported-numpy",
"scipy",
"pandas>=1.0.4",
"scipy==1.4.1; python_version<'3.9' and platform_machine!='aarch64' and platform_machine!='arm64'",
"scipy==1.7.3; python_version<'3.9' and platform_machine=='arm64'",
"scipy==1.5.3; python_version<'3.9' and platform_machine=='aarch64'",
"scipy==1.5.4; python_version>='3.9' and python_version<'3.10' and platform_machine!='arm64'",
"scipy==1.7.2; python_version>='3.10' and python_version<'3.11' and platform_machine!='arm64'",
"scipy==1.7.3; python_version>='3.10' and python_version<'3.11' and platform_machine=='arm64'",
"scipy==1.9.2; python_version>='3.11' and python_version<'3.12'",
"scipy>=1.11.2; python_version>'3.11'",
"pandas==1.0.4; python_version<'3.9' and platform_machine!='aarch64' and platform_machine!='arm64'",
"pandas==1.1.3; python_version<'3.9' and platform_machine=='aarch64'",
"pandas==1.4.0; python_version<'3.9' and platform_machine=='arm64'",
"pandas==1.2.2; python_version>='3.9' and python_version<'3.10' and platform_machine!='arm64'",
"pandas==1.4.0; python_version>='3.9' and python_version<'3.10' and platform_machine=='arm64'",
"pandas==1.3.4; python_version>='3.10' and python_version<'3.11' and platform_machine!='arm64'",
"pandas==1.4.0; python_version>='3.10' and python_version<'3.11' and platform_machine=='arm64'",
"pandas==1.5.1; python_version>='3.11' and python_version<'3.12'",
"pandas>=2.1.1; python_version>'3.11'",
"numpy<2.0.0",
"cython>=0.29.33",
"requests>=2.4.0",
"cloudpickle>=2.2.1; python_version>='3.11'",
Expand Down
1 change: 0 additions & 1 deletion python/xoscar/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@

# make sure methods are registered
from .backends import indigen, test
from .entrypoints import init_extension_entrypoints
from . import _version

del indigen, test
Expand Down
3 changes: 0 additions & 3 deletions python/xoscar/backends/pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
from ..api import Actor
from ..core import ActorRef, BufferRef, FileObjectRef, register_local_pool
from ..debug import debug_async_timeout, record_message_trace
from ..entrypoints import init_extension_entrypoints
from ..errors import (
ActorAlreadyExist,
ActorNotExist,
Expand Down Expand Up @@ -188,8 +187,6 @@ def __init__(
self._asyncio_task_timeout_detector_task = (
register_asyncio_task_timeout_detector()
)
# load third party extensions.
init_extension_entrypoints()
# init metrics
metric_configs = self._config.get_metric_configs()
metric_backend = metric_configs.get("backend")
Expand Down
42 changes: 0 additions & 42 deletions python/xoscar/entrypoints.py

This file was deleted.

0 comments on commit 3121c19

Please sign in to comment.