Skip to content

gh-54781: Move Lib/tkinter/test/test_ttk/ to Lib/test/test_ttk/ #94070

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

Merged
vstinner merged 8 commits into from
Jun 22, 2022
Merged

gh-54781: Move Lib/tkinter/test/test_ttk/ to Lib/test/test_ttk/ #94070

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9844364
gh-54781: Move Lib/tkinter/test/test_ttk/ to Lib/test/test_ttk/
vstinner Jun 21, 2022
0f60bef
Move Lib/tkinter/test/ to Lib/test/test_tkinter/
vstinner Jun 21, 2022
8ee5ffe
Add Lib/test/test_tkinter/__init__.py
vstinner Jun 21, 2022
67ea5c0
Update imports
vstinner Jun 21, 2022
e3ff9d5
Update references
vstinner Jun 21, 2022
78fc0ca
Add NEWS entry
vstinner Jun 21, 2022
bccf79d
Add __main__ sub-modules
vstinner Jun 21, 2022
941d382
Add missing unittest import
vstinner Jun 21, 2022
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
Prev Previous commit
Next Next commit
Update references
  • Loading branch information
@vstinner
vstinner committed Jun 22, 2022
commit e3ff9d518ea12458c9eb99afda320d209120eaa8
6 changes: 3 additions & 3 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1987,15 +1987,15 @@ TESTSUBDIRS= distutils/tests \
test/test_lib2to3/data/fixers \
test/test_lib2to3/data/fixers/myfixes \
test/test_peg_generator \
test/test_tkinter \
test/test_tools \
test/test_ttk \
test/test_warnings test/test_warnings/data \
test/test_zoneinfo test/test_zoneinfo/data \
test/test_unittest test/test_unittest/testmock \
test/tracedmodules \
test/xmltestdata test/xmltestdata/c14n-20 \
test/ziptestdata \
tkinter/test tkinter/test/test_tkinter \
tkinter/test/test_ttk
test/ziptestdata

TEST_MODULES=@TEST_MODULES@
libinstall: all $(srcdir)/Modules/xxmodule.c
Expand Down
93 changes: 44 additions & 49 deletions PCbuild/lib.pyproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,7 +1323,17 @@
<Compile Include="test\test_timeit.py" />
<Compile Include="test\test_timeout.py" />
<Compile Include="test\test_tix.py" />
<Compile Include="test\test_tk.py" />
<Compile Include="test\test_tkinter\__init__.py" />
<Compile Include="test\test_tkinter\support.py" />
<Compile Include="test\test_tkinter\test_font.py" />
<Compile Include="test\test_tkinter\test_geometry_managers.py" />
<Compile Include="test\test_tkinter\test_images.py" />
<Compile Include="test\test_tkinter\test_loadtk.py" />
<Compile Include="test\test_tkinter\test_misc.py" />
<Compile Include="test\test_tkinter\test_text.py" />
<Compile Include="test\test_tkinter\test_variables.py" />
<Compile Include="test\test_tkinter\test_widgets.py" />
<Compile Include="test\test_tkinter\widget_tests.py" />
<Compile Include="test\test_tokenize.py" />
<Compile Include="test\test_tools\test_fixcid.py" />
<Compile Include="test\test_tools\test_gprof2html.py" />
Expand All @@ -1339,8 +1349,11 @@
<Compile Include="test\test_trace.py" />
<Compile Include="test\test_traceback.py" />
<Compile Include="test\test_tracemalloc.py" />
<Compile Include="test\test_ttk_guionly.py" />
<Compile Include="test\test_ttk_textonly.py" />
<Compile Include="test\test_ttk\__init__.py" />
<Compile Include="test\test_ttk\test_extensions.py" />
<Compile Include="test\test_ttk\test_style.py" />
<Compile Include="test\test_ttk\test_widgets.py" />
<Compile Include="test\test_tuple.py" />
<Compile Include="test\test_turtle.py" />
<Compile Include="test\test_typechecks.py" />
Expand All @@ -1353,7 +1366,33 @@
<Compile Include="test\test_unicode_file.py" />
<Compile Include="test\test_unicode_file_functions.py" />
<Compile Include="test\test_unicode_identifiers.py" />
<Compile Include="test\test_unittest.py" />
<Compile Include="test\test_unittest\dummy.py" />
<Compile Include="test\test_unittest\support.py" />
<Compile Include="test\test_unittest\testmock\support.py" />
<Compile Include="test\test_unittest\testmock\testcallable.py" />
<Compile Include="test\test_unittest\testmock\testhelpers.py" />
<Compile Include="test\test_unittest\testmock\testmagicmethods.py" />
<Compile Include="test\test_unittest\testmock\testmock.py" />
<Compile Include="test\test_unittest\testmock\testpatch.py" />
<Compile Include="test\test_unittest\testmock\testsentinel.py" />
<Compile Include="test\test_unittest\testmock\testwith.py" />
<Compile Include="test\test_unittest\testmock\__init__.py" />
<Compile Include="test\test_unittest\testmock\__main__.py" />
<Compile Include="test\test_unittest\test_assertions.py" />
<Compile Include="test\test_unittest\test_break.py" />
<Compile Include="test\test_unittest\test_case.py" />
<Compile Include="test\test_unittest\test_discovery.py" />
<Compile Include="test\test_unittest\test_functiontestcase.py" />
<Compile Include="test\test_unittest\test_loader.py" />
<Compile Include="test\test_unittest\test_program.py" />
<Compile Include="test\test_unittest\test_result.py" />
<Compile Include="test\test_unittest\test_runner.py" />
<Compile Include="test\test_unittest\test_setups.py" />
<Compile Include="test\test_unittest\test_skipping.py" />
<Compile Include="test\test_unittest\test_suite.py" />
<Compile Include="test\test_unittest\_test_warnings.py" />
<Compile Include="test\test_unittest\__init__.py" />
<Compile Include="test\test_unittest\__main__.py" />
<Compile Include="test\test_univnewlines.py" />
<Compile Include="test\test_unpack.py" />
<Compile Include="test\test_unpack_ex.py" />
Expand Down Expand Up @@ -1432,22 +1471,6 @@
<Compile Include="tkinter\messagebox.py" />
<Compile Include="tkinter\scrolledtext.py" />
<Compile Include="tkinter\simpledialog.py" />
<Compile Include="tkinter\test\support.py" />
<Compile Include="tkinter\test\test_tkinter\test_font.py" />
<Compile Include="tkinter\test\test_tkinter\test_geometry_managers.py" />
<Compile Include="tkinter\test\test_tkinter\test_images.py" />
<Compile Include="tkinter\test\test_tkinter\test_loadtk.py" />
<Compile Include="tkinter\test\test_tkinter\test_misc.py" />
<Compile Include="tkinter\test\test_tkinter\test_text.py" />
<Compile Include="tkinter\test\test_tkinter\test_variables.py" />
<Compile Include="tkinter\test\test_tkinter\test_widgets.py" />
<Compile Include="tkinter\test\test_tkinter\__init__.py" />
<Compile Include="tkinter\test\test_ttk\test_extensions.py" />
<Compile Include="tkinter\test\test_ttk\test_style.py" />
<Compile Include="tkinter\test\test_ttk\test_widgets.py" />
<Compile Include="tkinter\test\test_ttk\__init__.py" />
<Compile Include="tkinter\test\widget_tests.py" />
<Compile Include="tkinter\test\__init__.py" />
<Compile Include="tkinter\tix.py" />
<Compile Include="tkinter\ttk.py" />
<Compile Include="tkinter\__init__.py" />
Expand Down Expand Up @@ -1490,33 +1513,6 @@
<Compile Include="unittest\runner.py" />
<Compile Include="unittest\signals.py" />
<Compile Include="unittest\suite.py" />
<Compile Include="test\test_unittest\dummy.py" />
<Compile Include="test\test_unittest\support.py" />
<Compile Include="test\test_unittest\testmock\support.py" />
<Compile Include="test\test_unittest\testmock\testcallable.py" />
<Compile Include="test\test_unittest\testmock\testhelpers.py" />
<Compile Include="test\test_unittest\testmock\testmagicmethods.py" />
<Compile Include="test\test_unittest\testmock\testmock.py" />
<Compile Include="test\test_unittest\testmock\testpatch.py" />
<Compile Include="test\test_unittest\testmock\testsentinel.py" />
<Compile Include="test\test_unittest\testmock\testwith.py" />
<Compile Include="test\test_unittest\testmock\__init__.py" />
<Compile Include="test\test_unittest\testmock\__main__.py" />
<Compile Include="test\test_unittest\test_assertions.py" />
<Compile Include="test\test_unittest\test_break.py" />
<Compile Include="test\test_unittest\test_case.py" />
<Compile Include="test\test_unittest\test_discovery.py" />
<Compile Include="test\test_unittest\test_functiontestcase.py" />
<Compile Include="test\test_unittest\test_loader.py" />
<Compile Include="test\test_unittest\test_program.py" />
<Compile Include="test\test_unittest\test_result.py" />
<Compile Include="test\test_unittest\test_runner.py" />
<Compile Include="test\test_unittest\test_setups.py" />
<Compile Include="test\test_unittest\test_skipping.py" />
<Compile Include="test\test_unittest\test_suite.py" />
<Compile Include="test\test_unittest\_test_warnings.py" />
<Compile Include="test\test_unittest\__init__.py" />
<Compile Include="test\test_unittest\__main__.py" />
<Compile Include="unittest\util.py" />
<Compile Include="unittest\__init__.py" />
<Compile Include="unittest\__main__.py" />
Expand Down Expand Up @@ -1802,16 +1798,15 @@
<Folder Include="test\test_lib2to3\data\fixers" />
<Folder Include="test\test_lib2to3\data\fixers\myfixes" />
<Folder Include="test\test_peg_generator" />
<Folder Include="test\test_tkinter" />
<Folder Include="test\test_tools" />
<Folder Include="test\test_ttk" />
<Folder Include="test\test_unittest" />
<Folder Include="test\test_unittest\testmock" />
<Folder Include="test\test_warnings" />
<Folder Include="test\test_warnings\data" />
<Folder Include="test\tracedmodules" />
<Folder Include="tkinter" />
<Folder Include="tkinter\test" />
<Folder Include="tkinter\test\test_tkinter" />
<Folder Include="tkinter\test\test_ttk" />
<Folder Include="turtledemo" />
<Folder Include="unittest" />
<Folder Include="urllib" />
Expand Down
13 changes: 1 addition & 12 deletions Tools/wasm/wasm_assets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,6 @@
"_zoneinfo": ["zoneinfo/"],
}

# regression test sub directories
OMIT_SUBDIRS = (
"tkinter/test/",
)

def get_builddir(args: argparse.Namespace) -> pathlib.Path:
"""Get builddir path from pybuilddir.txt
"""
Expand All @@ -136,9 +131,6 @@ def create_stdlib_zip(
*,
optimize: int = 0,
) -> None:
def filterfunc(name: str) -> bool:
return not name.startswith(args.omit_subdirs_absolute)

with zipfile.PyZipFile(
args.wasm_stdlib_zip, mode="w", compression=args.compression, optimize=optimize
) as pzf:
Expand All @@ -152,7 +144,7 @@ def filterfunc(name: str) -> bool:
continue
if entry.name.endswith(".py") or entry.is_dir():
# writepy() writes .pyc files (bytecode).
pzf.writepy(entry, filterfunc=filterfunc)
pzf.writepy(entry)


def detect_extension_modules(args: argparse.Namespace):
Expand Down Expand Up @@ -234,9 +226,6 @@ def main():
omit_files.extend(modfiles)

args.omit_files_absolute = {args.srcdir_lib / name for name in omit_files}
args.omit_subdirs_absolute = tuple(
str(args.srcdir_lib / name) for name in OMIT_SUBDIRS
)

# Empty, unused directory for dynamic libs, but required for site initialization.
args.wasm_dynload.mkdir(parents=True, exist_ok=True)
Expand Down