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

Import from packaging directly, add to requirements #6374

Merged
merged 2 commits into from
Jul 18, 2024
Merged

Import from packaging directly, add to requirements #6374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0fd453
Import from packaging directly, add to requirements
achamayou Jul 18, 2024
8d49069
Merge branch 'main' into fix_setuptools_import
achamayou Jul 18, 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
2 changes: 1 addition & 1 deletion python/ccf/_versionifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the Apache 2.0 License.

from setuptools.extern.packaging.version import ( # type: ignore
from packaging.version import ( # type: ignore
Version,
InvalidVersion,
)
Expand Down
4 changes: 3 additions & 1 deletion python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
loguru >= 0.5, == 0.*
cryptography == 42.*
string-color >= 1.2.1, == 1.*
pycose >= 1.0.1, == 1.*
pycose >= 1.0.1, == 1.*
setuptools == 58.*
packaging == 24.*
2 changes: 1 addition & 1 deletion tests/infra/github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import shutil
import requests

from setuptools.extern.packaging.version import Version # type: ignore
from packaging.version import Version # type: ignore

from loguru import logger as LOG

Expand Down
2 changes: 1 addition & 1 deletion tests/infra/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

import ccf._versionifier

from setuptools.extern.packaging.version import Version # type: ignore
from packaging.version import Version # type: ignore

from loguru import logger as LOG

Expand Down
2 changes: 1 addition & 1 deletion tests/infra/remote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import json
import infra.snp as snp
import ccf._versionifier
from setuptools.extern.packaging.version import ( # type: ignore
from packaging.version import ( # type: ignore
Version,
)

Expand Down