From f9cf2706ddeb61eb06ad94b91f3e40feea75c265 Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Wed, 4 Oct 2023 18:08:48 -0700 Subject: [PATCH] Try to fix circleci config --- .circleci/config.yml | 2 +- pyodide-build/pyodide_build/_py_compile.py | 1 - pyodide-build/pyodide_build/mkpkg.py | 3 ++- pyodide-build/pyodide_build/out_of_tree/pypi.py | 7 ++++--- pyodide-build/pyodide_build/pypabuild.py | 1 + 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cd99b82c5cb..d82894711a6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,7 @@ jobs: parameters: disable_dylink: description: The packages to be built. - type: boolean + type: integer default: 0 <<: *defaults environment: diff --git a/pyodide-build/pyodide_build/_py_compile.py b/pyodide-build/pyodide_build/_py_compile.py index 39445c97e2f..525745e409d 100644 --- a/pyodide-build/pyodide_build/_py_compile.py +++ b/pyodide-build/pyodide_build/_py_compile.py @@ -10,7 +10,6 @@ from packaging.tags import Tag from packaging.utils import parse_wheel_filename - from pyodide_build.common import _get_sha256_checksum from .logger import logger, set_log_level diff --git a/pyodide-build/pyodide_build/mkpkg.py b/pyodide-build/pyodide_build/mkpkg.py index dd8c8d5172a..6dec1661ca4 100755 --- a/pyodide-build/pyodide_build/mkpkg.py +++ b/pyodide-build/pyodide_build/mkpkg.py @@ -13,9 +13,10 @@ from typing import Any, Literal, TypedDict from urllib import request -from packaging.version import Version from ruamel.yaml import YAML +from packaging.version import Version + from .common import parse_top_level_import_name from .logger import logger diff --git a/pyodide-build/pyodide_build/out_of_tree/pypi.py b/pyodide-build/pyodide_build/out_of_tree/pypi.py index d7281dd49c1..6f941e6a85f 100644 --- a/pyodide-build/pyodide_build/out_of_tree/pypi.py +++ b/pyodide-build/pyodide_build/out_of_tree/pypi.py @@ -18,14 +18,15 @@ from zipfile import ZipFile import requests -from packaging.requirements import Requirement -from packaging.utils import canonicalize_name -from packaging.version import Version from resolvelib import BaseReporter, Resolver from resolvelib.providers import AbstractProvider from unearth.evaluator import TargetPython from unearth.finder import PackageFinder +from packaging.requirements import Requirement +from packaging.utils import canonicalize_name +from packaging.version import Version + from .. import build_env from ..common import repack_zip_archive from ..io import _BuildSpecExports diff --git a/pyodide-build/pyodide_build/pypabuild.py b/pyodide-build/pyodide_build/pypabuild.py index 9ca7a771cbc..f4649c8bd57 100644 --- a/pyodide-build/pyodide_build/pypabuild.py +++ b/pyodide-build/pyodide_build/pypabuild.py @@ -11,6 +11,7 @@ from build import BuildBackendException, ConfigSettingsType from build.env import DefaultIsolatedEnv + from packaging.requirements import Requirement from . import common, pywasmcross