Skip to content

Commit 6002e6c

Browse files
committed
Remove 'packaging' requirement (eventually)
1 parent c93f21e commit 6002e6c

3 files changed

Lines changed: 6 additions & 8 deletions

File tree

.github/workflows/wheel-builder.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,13 +332,13 @@ jobs:
332332
fi
333333
334334
# Install dependencies
335-
pip install "conan==2.21" && pip install wheel && pip install packaging && make deps
335+
pip install "conan==2.21" && pip install wheel && make deps
336336
337337
CIBW_BEFORE_ALL_MACOS: |
338-
pip install "conan==2.21" && pip install wheel && pip install packaging && make deps
338+
pip install "conan==2.21" && pip install wheel && make deps
339339
340340
CIBW_BEFORE_ALL_WINDOWS: |
341-
pip install "conan==2.21" && pip install wheel && pip install packaging && make deps
341+
pip install "conan==2.21" && pip install wheel && make deps
342342
343343
344344
CIBW_REPAIR_WHEEL_COMMAND_LINUX: |

build-system/luxmake/utils.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import pathlib
1414
import re
1515
from dataclasses import dataclass
16-
from packaging.version import Version
1716

1817
# Logger
1918
logger = logging.getLogger("LuxCore")
@@ -129,7 +128,7 @@ def get_dep_version(dep):
129128
raise ValueError(f"No dependency '{dep}' found")
130129
version, *_ = versions
131130

132-
return Version(version)
131+
return version
133132

134133

135134
def unpack(path, dest):

build-system/luxmake/wheel.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import platform
1313
import os
1414
import shlex
15-
from packaging.version import Version
1615
from pathlib import Path
1716

1817
from .constants import (
@@ -142,10 +141,10 @@ def make_wheel(args):
142141
# Export METADATA file
143142
with open(dist_info / "METADATA", "w", encoding="utf-8") as f:
144143
nvrtc_version = get_dep_version("nvrtc")
145-
major = nvrtc_version.major
144+
major = float(nvrtc_version.split('.')[0])
146145
requirement = (
147146
f"nvidia-cuda-nvrtc-cu{major}=={nvrtc_version}"
148-
if nvrtc_version.major <= 12
147+
if major <= 12
149148
else f"nvidia-cuda-nvrtc=={nvrtc_version}"
150149
)
151150

0 commit comments

Comments
 (0)