Skip to content

Commit ca293d4

Browse files
committed
Remove external package loading autogate/compat flag and make default.
1 parent 4e753b6 commit ca293d4

File tree

4 files changed

+3
-19
lines changed

4 files changed

+3
-19
lines changed

src/workerd/io/compatibility-date.capnp

+1-5
Original file line numberDiff line numberDiff line change
@@ -646,12 +646,8 @@ struct CompatibilityFlags @0x8f8c1b68151b6cef {
646646
# the behavior to uppercase all methods prior to parsing to that the method is always
647647
# recognized if it is a known method.
648648

649-
pythonExternalPackages @66 :Bool
649+
obsolete66 @66 :Bool
650650
$compatEnableFlag("python_external_packages");
651-
# Temporary flag to load Python packages from external bundle loaded at runtime.
652-
#
653-
# This is a compat flag so that we can opt in our test workers into it before rolling out to
654-
# everyone.
655651

656652
noTopLevelAwaitInRequire @67 :Bool
657653
$compatEnableFlag("disable_top_level_await_in_require")

src/workerd/server/workerd-api.c++

+2-9
Original file line numberDiff line numberDiff line change
@@ -572,15 +572,8 @@ void WorkerdApi::compileModules(jsg::Lock& lockParam,
572572
jsg::ModuleRegistry::Type::INTERNAL);
573573

574574
// Inject packages tar file
575-
if (featureFlags.getPythonExternalPackages() ||
576-
util::Autogate::isEnabled(util::AutogateKey::PYTHON_FETCH_INDIVIDUAL_PACKAGES)) {
577-
modules->addBuiltinModule("pyodide-internal:packages_tar_reader", "export default { }"_kj,
578-
workerd::jsg::ModuleRegistry::Type::INTERNAL, {});
579-
} else {
580-
modules->addBuiltinModule("pyodide-internal:packages_tar_reader",
581-
jsg::alloc<ReadOnlyBuffer>(PYODIDE_PACKAGES_TAR.get()),
582-
workerd::jsg::ModuleRegistry::Type::INTERNAL);
583-
}
575+
modules->addBuiltinModule("pyodide-internal:packages_tar_reader", "export default { }"_kj,
576+
workerd::jsg::ModuleRegistry::Type::INTERNAL, {});
584577

585578
// Inject artifact bundler.
586579
modules->addBuiltinModule("pyodide-internal:artifacts",

src/workerd/util/autogate.c++

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ kj::StringPtr KJ_STRINGIFY(AutogateKey key) {
1919
return "test-workerd"_kj;
2020
case AutogateKey::STREAMING_TAIL_WORKERS:
2121
return "streaming-tail-workers"_kj;
22-
case AutogateKey::PYTHON_FETCH_INDIVIDUAL_PACKAGES:
23-
return "python-fetch-individual-packages";
2422
case AutogateKey::NumOfKeys:
2523
KJ_FAIL_ASSERT("NumOfKeys should not be used in getName");
2624
}

src/workerd/util/autogate.h

-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ namespace workerd::util {
1515
enum class AutogateKey {
1616
TEST_WORKERD,
1717
STREAMING_TAIL_WORKERS,
18-
// Fetches Python packages as individual bundles from GCS instead of using a single big bundle
19-
// embedded in the binary
20-
PYTHON_FETCH_INDIVIDUAL_PACKAGES,
2118
NumOfKeys // Reserved for iteration.
2219
};
2320

0 commit comments

Comments
 (0)