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.

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

Jump to bottom

LIU-408: Add support for Python 3.11 and 3.12 #290

Merged
merged 4 commits into from
Nov 5, 2024
Merged

LIU-408: Add support for Python 3.11 and 3.12 #290

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
00b4c2f
LIU-408: Add support for Python 3.11 and 3.12
myxie Oct 9, 2024
d1d4278
LIU-408: Test <3.10 version for entry points.
myxie Oct 15, 2024
d64e45f
LIU-408: Disable no member error
myxie Oct 15, 2024
877c4a4
LIU-408: Disable correct error
myxie Oct 15, 2024
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
12 changes: 11 additions & 1 deletion .github/workflows/run-unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,17 @@ jobs:
translator: no
- python-version: "3.10"
test_number: 2
desc: "full package"
desc: "full package v3.10"
engine: yes
translator: yes
- python-version: "3.11"
test_number: 3
desc: "full package v3.11"
engine: yes
translator: yes
- python-version: "3.12"
test_number: 4
desc: "full package v3.12"
engine: yes
translator: yes

Expand Down
15 changes: 9 additions & 6 deletions daliuge-common/dlg/common/tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,16 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#
"""dlg command line utility"""

"""dlg command line utility"""
import importlib
import logging
import optparse
import subprocess
import sys
import time

import pkg_resources

from importlib.metadata import entry_points

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -117,10 +116,14 @@ def version(parser, args):

cmdwrap("version", "Reports the DALiuGE version and exits", version)


def _load_commands():
for entry_point in pkg_resources.iter_entry_points("dlg.tool_commands"):
entry_point.load().register_commands()
if sys.version_info.minor < 10:
all_entry_points = entry_points()
for entry_point in all_entry_points["dlg.tool_commands"]:
entry_point.load().register_commands()
else:
for entry_point in entry_points(group="dlg.tool_commands"): # pylint: disable=unexpected-keyword-arg
entry_point.load().register_commands()


def print_usage(prgname):
Expand Down
4 changes: 2 additions & 2 deletions daliuge-common/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ def do_versioning():
install_requires = [
"gputil>=1.4.0",
"merklelib@git+https://github.com/pritchardn/merklelib",
"pyzmq==25.1.0",
"pydantic==1.10.13",
"pyzmq==25.1.1",
"pydantic>=2.5",
"boto3",
"phonenumbers",
"mailchecker",
Expand Down
2 changes: 1 addition & 1 deletion daliuge-engine/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def run(self):
"paramiko",
"psutil",
"python-daemon",
"pyzmq == 25.1.0",
"pyzmq == 25.1.1", # Python 25.1.1 is minimal install that supports Python 3.12
"scp",
"pyext @ git+https://github.com/itea1001/PyExt",
"pyyaml",
Expand Down
Loading