diff --git a/setupsrc/pypdfium2_setup/autorelease.py b/setupsrc/pypdfium2_setup/autorelease.py index a338b18d2..116faa724 100644 --- a/setupsrc/pypdfium2_setup/autorelease.py +++ b/setupsrc/pypdfium2_setup/autorelease.py @@ -12,29 +12,8 @@ sys.path.insert(0, str(Path(__file__).parents[1])) from pypdfium2_setup import update_pdfium -# CONSIDER glob import or dotted access -from pypdfium2_setup.packaging_base import ( - run_cmd, - set_versions, - get_version_ns, - get_full_version, - get_latest_version, - get_changelog_staging, - Host, - DataTree, - SourceTree, - PDFium_URL, - RepositoryURL, - Changelog, - ChangelogStaging, - VersionFile, - VerNamespace, - BindingsFileName, - AutoreleaseDir, - MajorUpdateFile, - BetaUpdateFile, - RefBindingsFile, -) +# TODO consider dotted access? +from pypdfium2_setup.packaging_base import * # these files/dirs do not necessarily need to have been changed, `git add` silently skips that diff --git a/setupsrc/pypdfium2_setup/build_pdfium.py b/setupsrc/pypdfium2_setup/build_pdfium.py index 672356f27..2bf7a09e3 100755 --- a/setupsrc/pypdfium2_setup/build_pdfium.py +++ b/setupsrc/pypdfium2_setup/build_pdfium.py @@ -12,19 +12,8 @@ from pathlib import Path, WindowsPath sys.path.insert(0, str(Path(__file__).parents[1])) -# CONSIDER glob import or dotted access -from pypdfium2_setup.packaging_base import ( - Host, - SB_Dir, - DataTree, - PDFium_URL, - DepotTools_URL, - LibnameForSystem, - VerStatusFileName, - PlatformNames, - run_cmd, - call_ctypesgen, -) +# TODO consider dotted access? +from pypdfium2_setup.packaging_base import * PatchDir = SB_Dir / "patches" diff --git a/setupsrc/pypdfium2_setup/craft_packages.py b/setupsrc/pypdfium2_setup/craft_packages.py index 11972a9f4..4f3e206c0 100644 --- a/setupsrc/pypdfium2_setup/craft_packages.py +++ b/setupsrc/pypdfium2_setup/craft_packages.py @@ -9,22 +9,8 @@ from pathlib import Path sys.path.insert(0, str(Path(__file__).parents[1])) -# CONSIDER glob import or dotted access -from pypdfium2_setup.packaging_base import ( - run_cmd, - clean_platfiles, - get_latest_version, - Host, - ModuleDir, - BindingsFileName, - LibnameForSystem, - BinaryPlatforms, - SourceTree, - BinarySpec_EnvVar, - BinarySpec_V8Indicator, - BinarySpec_VersionSep, - PlatformTarget_None, -) +# TODO consider dotted access? +from pypdfium2_setup.packaging_base import * class ArtifactStash: diff --git a/setupsrc/pypdfium2_setup/emplace.py b/setupsrc/pypdfium2_setup/emplace.py index dca7c0ecf..1bc4f04a9 100644 --- a/setupsrc/pypdfium2_setup/emplace.py +++ b/setupsrc/pypdfium2_setup/emplace.py @@ -9,26 +9,8 @@ sys.path.insert(0, str(Path(__file__).parents[1])) from pypdfium2_setup import update_pdfium -from pypdfium2_setup.packaging_base import ( - # CONSIDER glob import or dotted access - Host, - DataTree, - BinarySpec_EnvVar, - BinarySpec_VersionSep, - BinarySpec_V8Indicator, - PlatformTarget_Auto, - PlatformTarget_None, - VersionTarget_Latest, - VerStatusFileName, - V8StatusFileName, - PlatformNames, - get_platfiles, - clean_platfiles, - emplace_platfiles, - get_latest_version, - read_version_file, - purge_pdfium_versions, -) +# TODO consider dotted access? +from pypdfium2_setup.packaging_base import * # CONSIDER Linux/macOS: check that minimum OS version requirements are fulfilled diff --git a/setupsrc/pypdfium2_setup/setup_base.py b/setupsrc/pypdfium2_setup/setup_base.py index 7e9ce74b2..b030e25cb 100644 --- a/setupsrc/pypdfium2_setup/setup_base.py +++ b/setupsrc/pypdfium2_setup/setup_base.py @@ -7,7 +7,7 @@ from wheel.bdist_wheel import bdist_wheel sys.path.insert(0, str(Path(__file__).parents[1])) -# CONSIDER glob import or dotted access +# TODO consider glob import or dotted access from pypdfium2_setup.packaging_base import ( VerNamespace, LibnameForSystem, diff --git a/setupsrc/pypdfium2_setup/update_pdfium.py b/setupsrc/pypdfium2_setup/update_pdfium.py index e8215121e..7ec6ae747 100755 --- a/setupsrc/pypdfium2_setup/update_pdfium.py +++ b/setupsrc/pypdfium2_setup/update_pdfium.py @@ -13,21 +13,8 @@ sys.path.insert(0, str(Path(__file__).parents[1])) from pypdfium2_setup._compat import safer_tar_unpack -# CONSIDER glob import or dotted access -from pypdfium2_setup.packaging_base import ( - DataTree, - VerStatusFileName, - V8StatusFileName, - ReleaseNames, - BinaryPlatforms, - ReleaseURL, - SystemNames, - LibnameForSystem, - plat_to_system, - get_latest_version, - get_full_version, - call_ctypesgen, -) +# TODO consider dotted access? +from pypdfium2_setup.packaging_base import * def clear_data(download_files):