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

fix: Package Upload to wheel #378

Merged
merged 1 commit into from
Apr 14, 2024
Merged

fix: Package Upload to wheel #378

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 11 additions & 9 deletions bdist/py/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ def clear_dir(path):
logger.info("Assuming version is %s", version_id)

ap_map: dict[str, str] = {
"darwin_amd64_v1": "macosx_x86_64",
"darwin_arm64": "darwin_aarch64",
"linux_amd64_v1": "manylinux1_x86_64",
"linux_arm64": "manylinux1_aarch64",
"linux_arm_7": "linux_armv7l",
"darwin_amd64_v1": "macosx_10_0_x86_64",
"darwin_arm64": "macosx_10_0_arm64",
"linux_amd64_v1": "manylinux2014_x86_64",
"linux_arm64": "manylinux2014_aarch64",
"linux_arm_7": "manylinux2014_armv7l",
"windows_amd64_v1": "win_amd64",
"windows_arm64": "win_arch64",
"windows_arm64": "win_arm64",
}

executables = {"protolint", "protoc-gen-protolint"}
Expand All @@ -95,10 +95,12 @@ def clear_dir(path):

p_executables = [dist / f"{exe}_{arch_platform}" / f"{exe}{suffix}" for exe in executables]

file_name = package_name.replace('-', '_')

logger.debug("Creating wheel data folder")
dataFolder = pdir / f"{package_name}-{version_id}.data"
dataFolder = pdir / f"{file_name}-{version_id}.data"
logger.debug("Creating wheel data folder")
distInfoFolder = pdir / f"{package_name}-{version_id}.dist-info"
distInfoFolder = pdir / f"{file_name}-{version_id}.dist-info"

dataFolder.mkdir(parents=True, exist_ok=True)
distInfoFolder.mkdir(parents=True, exist_ok=True)
Expand Down Expand Up @@ -171,7 +173,7 @@ def clear_dir(path):
rl.write(distInfoFolder.name + "/RECORD,,\n")
wheel_content.append(distInfoFolder / "RECORD")

whl_file = wheel / f"{package_name}-{version_id}-{tag}.whl"
whl_file = wheel / f"{file_name}-{version_id}-{tag}.whl"
if whl_file.is_file():
logger.debug("Removing existing wheel file")
whl_file.unlink()
Expand Down
Loading