Replaced package "pkg_resources" with "packaging" #7953

K-Rilla · 2024-07-26T00:36:41Z

Fixes #7559 .

Description

Replaced "pkg_resources" references with "packaging" in MONAI/monai/utils/module.py & setup.py
Changes were made in functions "pytorch_after", "version_leq", "version_geq".

Types of changes

Non-breaking change (fix or new feature that would not break existing functionality).

for more information, see https://pre-commit.ci

KumoLiu · 2024-07-26T09:47:42Z

please also include the packaging in the "requirements-min.txt" to avoid the test error. Thanks!
https://github.com/Project-MONAI/MONAI/blob/dev/requirements-min.txt

monai/utils/module.py

Signed-off-by: dedeepyasai <[email protected]>

Signed-off-by Kelvin R <[email protected]>

for more information, see https://pre-commit.ci

DCO Remediation Commit for saelra <[email protected]> I, saelra <[email protected]>, hereby add my Signed-off-by to this commit: 77207ad Signed-off-by: saelra <[email protected]>

I, saelra <[email protected]>, hereby add my Signed-off-by to this commit: 77207ad Signed-off-by: saelra <[email protected]>

I, Kelvin R <[email protected]>, hereby add my Signed-off-by to this commit: 9656e43 I, Kelvin R <[email protected]>, hereby add my Signed-off-by to this commit: 598f70d I, Kelvin R <[email protected]>, hereby add my Signed-off-by to this commit: df38261 I, Kelvin R <[email protected]>, hereby add my Signed-off-by to this commit: e0c4d21 Signed-off-by: Kelvin R <[email protected]>

for more information, see https://pre-commit.ci

Signed-off-by: Kelvin R <[email protected]>

KumoLiu · 2024-07-29T05:10:48Z

Hi @K-Rilla, please take a look at the comments, I guess you misunderstand several points. Feel free ask if you met any issue. Thanks!

monai/utils/module.py

Signed-off-by: ken-ni <[email protected]>

monai/utils/module.py

requirements-dev.txt

KumoLiu · 2024-08-02T02:07:12Z

Please help take a look at the ci error. Thanks.

Traceback (most recent call last):
  File "<string>", line 1, in <module>
  File "/home/runner/work/MONAI/MONAI/monai/__init__.py", line 40, in <module>
    from .utils.module import load_submodules  # noqa: E402
  File "/home/runner/work/MONAI/MONAI/monai/utils/__init__.py", line 20, in <module>
    from .enums import (
  File "/home/runner/work/MONAI/MONAI/monai/utils/enums.py", line 617, in <module>
    @deprecated(since="1.2", removed="1.4", msg_suffix="please use `AlgoKeys` instead.")
  File "/home/runner/work/MONAI/MONAI/monai/utils/deprecate_utils.py", line 73, in deprecated
    if since is not None and removed is not None and not version_leq(since, removed):
  File "/home/runner/work/MONAI/MONAI/monai/utils/module.py", line 570, in version_leq
    except pkging.version.Version.InvalidVersion:
AttributeError: module 'packaging' has no attribute 'version'

…xt file Signed-off-by: DuretiShemsi <[email protected]>

…y.github.com> I, Dureti <[email protected]>, hereby add my Signed-off-by to this commit: fe1a415 Signed-off-by: Dureti <[email protected]>

Signed-off-by: Dureti <[email protected]>

Signed-off-by: Kelvin R <[email protected]>

for more information, see https://pre-commit.ci

monai/utils/module.py

ericspod · 2024-08-07T12:27:07Z

From the CI issue with building the wheel, packaging may be needed in places like here where setup-related things are installed with pip.

Signed-off-by: ken-ni <[email protected]>

Signed-off-by: YunLiu <[email protected]>

This reverts commit f8689c8.

…hub.com> I, YunLiu <[email protected]>, hereby add my Signed-off-by to this commit: e3c3490 Signed-off-by: YunLiu <[email protected]>

KumoLiu · 2024-08-09T08:05:31Z

/build

KumoLiu · 2024-08-09T08:39:40Z

/build

Fixes Project-MONAI#7559 . ### Description Replaced "pkg_resources" references with "packaging" in MONAI/monai/utils/module.py & setup.py Changes were made in functions "pytorch_after", "version_leq", "version_geq". ### Types of changes - Non-breaking change (fix or new feature that would not break existing functionality). --------- Signed-off-by: dedeepyasai <[email protected]> Signed-off-by: saelra <[email protected]> Signed-off-by: Kelvin R <[email protected]> Signed-off-by: ken-ni <[email protected]> Signed-off-by: Dureti <[email protected]> Signed-off-by: YunLiu <[email protected]> Co-authored-by: saelra <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: dedeepyasai <[email protected]> Co-authored-by: YunLiu <[email protected]> Co-authored-by: Ratanachat Saelee <[email protected]> Co-authored-by: ken-ni <[email protected]> Co-authored-by: Dureti <[email protected]>

Saelra and others added 6 commits July 20, 2024 11:31

remove pkg_resources and replace with packaging.version

77207ad

Merge branch 'Project-MONAI:dev' into dev

6e1970f

Merge branch 'Project-MONAI:dev' into dev

94195e9

Removed comments from pkg_resources

9656e43

Removed a comment

598f70d

[pre-commit.ci] auto fixes from pre-commit.com hooks

ab3ae73

for more information, see https://pre-commit.ci

dedeepyasai force-pushed the dev branch from 3fe5833 to b45bf53 Compare July 26, 2024 04:51

KumoLiu reviewed Jul 26, 2024

View reviewed changes

monai/utils/module.py Outdated Show resolved Hide resolved

monai/utils/module.py Outdated Show resolved Hide resolved

monai/utils/module.py Outdated Show resolved Hide resolved

monai/utils/module.py Outdated Show resolved Hide resolved

monai/utils/module.py Outdated Show resolved Hide resolved

dedeepyasai force-pushed the dev branch from b45bf53 to 4727db2 Compare July 26, 2024 14:42

updated packaging in setup, utils

967f4ad

Signed-off-by: dedeepyasai <[email protected]>

dedeepyasai force-pushed the dev branch from 4727db2 to 967f4ad Compare July 26, 2024 16:04

K-Rilla and others added 11 commits July 27, 2024 10:37

Fixing imports

df38261

Fixing imports

e0c4d21

Signed-off-by Kelvin R <[email protected]>

Merge branch 'dev' of https://github.com/K-Rilla/MONAI into dev

9dd37f7

[pre-commit.ci] auto fixes from pre-commit.com hooks

6acc718

for more information, see https://pre-commit.ci

Fix DCO

758fd66

DCO Remediation Commit for saelra <[email protected]> I, saelra <[email protected]>, hereby add my Signed-off-by to this commit: 77207ad Signed-off-by: saelra <[email protected]>

Fix DCO

6ab46f7

I, saelra <[email protected]>, hereby add my Signed-off-by to this commit: 77207ad Signed-off-by: saelra <[email protected]>

Merge remote-tracking branch 'origin/dev' into dev

6bbaa86

[pre-commit.ci] auto fixes from pre-commit.com hooks

4008495

for more information, see https://pre-commit.ci

Fixing version

bb22a37

Signed-off-by: Kelvin R <[email protected]>

Merge branch 'dev' of https://github.com/K-Rilla/MONAI into dev

a27f28a

KumoLiu reviewed Jul 31, 2024

View reviewed changes

monai/utils/module.py Outdated Show resolved Hide resolved

KumoLiu and others added 3 commits July 31, 2024 18:09

Merge branch 'dev' into dev

44035af

Merge branch 'Project-MONAI:dev' into dev

084a573

Addressed comments, reverted pkging references

de41c64

Signed-off-by: ken-ni <[email protected]>

KumoLiu reviewed Aug 2, 2024

View reviewed changes

monai/utils/module.py Outdated Show resolved Hide resolved

KumoLiu reviewed Aug 2, 2024

View reviewed changes

monai/utils/module.py Outdated Show resolved Hide resolved

KumoLiu reviewed Aug 2, 2024

View reviewed changes

requirements-dev.txt Outdated Show resolved Hide resolved

Saelra and others added 10 commits August 3, 2024 10:16

Merge branch 'Project-MONAI:dev' into dev

e30869d

updating exception packaging, remove packaging from requirement-dev.t…

fe1a415

…xt file Signed-off-by: DuretiShemsi <[email protected]>

DCO Remediation Commit for Dureti <[email protected]…

ed56b7e

…y.github.com> I, Dureti <[email protected]>, hereby add my Signed-off-by to this commit: fe1a415 Signed-off-by: Dureti <[email protected]>

updating exception packaging, remove packaging from requirement-dev.txt

e53b5a9

Signed-off-by: Dureti <[email protected]>

Merge branch 'dev' of github.com:K-Rilla/MONAI into dev

6f5005c

fix linting, changed import sub module packaging.version

d93374f

Signed-off-by: Dureti <[email protected]>

Merge branch 'dev' into dev

52cc946

Merge branch 'dev' into dev

e1e9231

Added packaging to requirements-dev.

25e19a9

Signed-off-by: Kelvin R <[email protected]>

[pre-commit.ci] auto fixes from pre-commit.com hooks

6132581

for more information, see https://pre-commit.ci

KumoLiu reviewed Aug 7, 2024

View reviewed changes

monai/utils/module.py Show resolved Hide resolved

ken-ni and others added 8 commits August 8, 2024 17:13

Merge branch 'dev' into dev

cd24d26

Remove packaging from requirements-dev

4041ffe

Signed-off-by: ken-ni <[email protected]>

add packaging in pythonapp.yml

8226d4c

Signed-off-by: YunLiu <[email protected]>

Merge branch 'dev' into dev

0223751

minor fix

f8689c8

Signed-off-by: YunLiu <[email protected]>

Revert "minor fix"

e3c3490

This reverts commit f8689c8.

DCO Remediation Commit for YunLiu <[email protected]…

d28e27a

…hub.com> I, YunLiu <[email protected]>, hereby add my Signed-off-by to this commit: e3c3490 Signed-off-by: YunLiu <[email protected]>

Merge branch 'dev' into dev

640726d

KumoLiu enabled auto-merge (squash) August 9, 2024 08:54

KumoLiu approved these changes Aug 9, 2024

View reviewed changes

KumoLiu merged commit 6be7b13 into Project-MONAI:dev Aug 9, 2024
28 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replaced package "pkg_resources" with "packaging" #7953

Replaced package "pkg_resources" with "packaging" #7953

K-Rilla commented Jul 26, 2024

KumoLiu commented Jul 26, 2024

KumoLiu commented Jul 29, 2024

KumoLiu commented Aug 2, 2024

ericspod commented Aug 7, 2024

KumoLiu commented Aug 9, 2024

KumoLiu commented Aug 9, 2024

Replaced package "pkg_resources" with "packaging" #7953

Replaced package "pkg_resources" with "packaging" #7953

Conversation

K-Rilla commented Jul 26, 2024

Description

Types of changes

KumoLiu commented Jul 26, 2024

KumoLiu commented Jul 29, 2024

KumoLiu commented Aug 2, 2024

ericspod commented Aug 7, 2024

KumoLiu commented Aug 9, 2024

KumoLiu commented Aug 9, 2024