fix: use find_packages() to include subpackages in wheel by Kaylebor · Pull Request #39 · openscilab/tocount

Kaylebor · 2026-05-28T09:41:31Z

The PyPI wheel (v0.5) is missing all subpackages (rule_based, qwen_qwq, deepseek_r1, llama_3_1, tiktoken_cl100k, tiktoken_o200k, tiktoken_r50k) because setup.py hardcodes packages=['tocount'].

This causes ModuleNotFoundError: No module named 'tocount.rule_based' on pip install tocount.

Fix: Use setuptools.find_packages() to automatically discover all subpackages.

Tested by building wheel locally and verifying all subpackages are present.

The PyPI wheel was missing all subpackages (rule_based, qwen_qwq, deepseek_r1, llama_3_1, tiktoken_*) because packages was hardcoded to ['tocount']. Using find_packages() ensures all subpackages are included in the built wheel.

sadrasabouri

Thanks, @Kaylebor. I verify that the issue you raised exists.
I had some comments on your changes. Feel free to apply them and I will review again.
Also, make sure you read contributing guideline and add your name to AUTHORS.md under Other Contributors.

PS: You can also add a GitHub action test to capture this failure in the future.

@Kaylebor

- Replace find_packages() with explicit package list per reviewer feedback - Remove broken distutils fallback (find_packages doesn't exist there) - Add @Kaylebor to AUTHORS.md under Other Contributors Addresses review comments in openscilab#39

codacy-production · 2026-05-29T14:33:21Z

Up to standards ✅

🟢 Issues 0 issues

Results:
0 new issues

View in Codacy

🟢 Metrics 0 complexity · 0 duplication

Metric Results

Complexity 0

Duplication 0

View in Codacy

_{NEW Get contextual insights on your PRs based on Codacy's metrics, along with PR and Jira context, without leaving GitHub. Enable AI reviewer}
_{TIP This summary will be updated as you push new changes.}

Kaylebor · 2026-05-29T14:34:01Z

@sadrasabouri applied your suggestions, feel free to tell me what you think 👍🏼

I do notice that Codacy Static Code Analysis failed, but I can't see the output, all good?

Edit: I see the bot comment now, nevermind. I'll check it.

sadrasabouri

Much better now. Thanks.
While you're working on the Codacy issues, please:

make the target branch dev not main
add changed to changelog.md
[optional] add a test to capture this failure in the future

codecov-commenter · 2026-05-29T21:26:36Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 97.68%. Comparing base (764ab90) to head (1761de5).
⚠️ Report is 2 commits behind head on dev.

Additional details and impacted files

@@            Coverage Diff             @@
##              dev      #39      +/-   ##
==========================================
+ Coverage   97.64%   97.68%   +0.04%     
==========================================
  Files          18       18              
  Lines         254      258       +4     
  Branches       13       13              
==========================================
+ Hits          248      252       +4     
  Misses          3        3              
  Partials        3        3

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

- Add [Unreleased] entry for setup.py subpackage fix - Add tests/test_package.py to verify all subpackages are importable Catches wheel packaging regressions where subpackages would be missing after installation.

Kaylebor · 2026-05-31T12:51:46Z

@sadrasabouri

Much better now. Thanks. While you're working on the Codacy issues, please:
1. make the target branch `dev` not `main`

2. add changed to changelog.md

3. [optional] add a test to capture this failure in the future

All three done! The test is somewhat simple, mostly just tests that current packages are available after building the wheel. But it does build the wheel too, so if that fails we'll catch that in the future.

Also, seems like Codacy issue was transient, it auto-fixed itself.

All good?

sadrasabouri

Thanks so much @Kaylebor
I fired the test workflows and left some final comments for you.

PS: and yes, Codacy seems like false alarming.

sadrasabouri · 2026-05-31T19:33:51Z

+"""Regression test for wheel packaging (issue #39).
+
+Ensures all subpackages are included in the built wheel.
+The original bug: setup.py hardcoded packages=['tocount'], omitting
+subpackages from the PyPI wheel and causing ModuleNotFoundError.


It doesn't need to be that detailed. Make it concise like other tests.

sadrasabouri · 2026-05-31T19:38:05Z

+        if result.returncode != 0:
+            pytest.skip(f"Could not build wheel:\n{result.stderr}")


Let's assert this as well. If the wheel installation is not working that's an issue we should notice.

sadrasabouri · 2026-05-31T19:47:03Z

+                pkg_dir = pkg.replace(".", "/") + "/"
+                assert any(
+                    name.startswith(pkg_dir) for name in names
+                ), f"{pkg} missing from wheel"


This part is a bit concerning. I suggest doing this instead:

pkg_init = pkg.replace(".", "/") + "/__init__.py" assert pkg_init in names, f"{pkg} (__init__.py) missing from wheel"

sadrasabouri · 2026-05-31T19:47:59Z

+### Fixed
+- `setup.py` package list updated to include all subpackages in the wheel


### Changed - `setup.py` updated

sadrasabouri · 2026-05-31T19:48:49Z

-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
+from setuptools import setup


Also, revert these lines to the original format (with try/except)

sadrasabouri · 2026-06-04T07:13:15Z

@sepandhaghighi can you apply the same changes you applied in other pr here as well?

sepandhaghighi · 2026-06-04T23:10:15Z

@sepandhaghighi can you apply the same changes you applied in other pr here as well?

Yeah, I will fix it within the next 24 hours 💯

sepandhaghighi · 2026-06-05T15:29:01Z

@sadrasabouri

I eliminated legacy distutils.core and utilized the find_packages function with a pattern to gather all submodules. I also removed the package test, as it was somewhat hacky; we plan to implement more robust tests later.

sadrasabouri

Looks good to me. @Kaylebor, thanks for your contribution.

fix: use find_packages() to include subpackages in wheel

96b0cd8

The PyPI wheel was missing all subpackages (rule_based, qwen_qwq, deepseek_r1, llama_3_1, tiktoken_*) because packages was hardcoded to ['tocount']. Using find_packages() ensures all subpackages are included in the built wheel.

sadrasabouri requested changes May 28, 2026

View reviewed changes

Comment thread setup.py Outdated

Comment thread setup.py Outdated

sepandhaghighi assigned Kaylebor May 28, 2026

sepandhaghighi added the bug Something isn't working label May 28, 2026

sepandhaghighi added this to the tocount v0.6 milestone May 28, 2026

Kaylebor requested a review from sadrasabouri May 29, 2026 14:32

sadrasabouri requested changes May 29, 2026

View reviewed changes

Kaylebor changed the base branch from main to dev May 31, 2026 12:38

docs: update CHANGELOG and add packaging test

ba53179

- Add [Unreleased] entry for setup.py subpackage fix - Add tests/test_package.py to verify all subpackages are importable Catches wheel packaging regressions where subpackages would be missing after installation.

Kaylebor force-pushed the fix-wheel-subpackages branch from 8c8bb5e to ba53179 Compare May 31, 2026 12:50

sadrasabouri requested changes May 31, 2026

View reviewed changes

sepandhaghighi added 4 commits June 5, 2026 18:39

fix : fix setup.py

9cf57fe

fix : remove package test

992c841

fix : fix typo

ea32d7b

fix : fix typo

1761de5

sepandhaghighi requested a review from sadrasabouri June 5, 2026 15:17

sepandhaghighi self-assigned this Jun 5, 2026

sadrasabouri approved these changes Jun 5, 2026

View reviewed changes

sadrasabouri merged commit f92b6b6 into openscilab:dev Jun 5, 2026
25 checks passed

		if result.returncode != 0:
		pytest.skip(f"Could not build wheel:\n{result.stderr}")

		### Fixed
		- `setup.py` package list updated to include all subpackages in the wheel

Conversation

Kaylebor commented May 28, 2026

Uh oh!

sadrasabouri left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

codacy-production Bot commented May 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Up to standards ✅

Uh oh!

Kaylebor commented May 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sadrasabouri left a comment

Choose a reason for hiding this comment

Uh oh!

codecov-commenter commented May 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Kaylebor commented May 31, 2026

Uh oh!

sadrasabouri left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sadrasabouri May 31, 2026

Choose a reason for hiding this comment

Uh oh!

sadrasabouri May 31, 2026

Choose a reason for hiding this comment

Uh oh!

sadrasabouri May 31, 2026

Choose a reason for hiding this comment

Uh oh!

sadrasabouri May 31, 2026

Choose a reason for hiding this comment

Uh oh!

sadrasabouri May 31, 2026

Choose a reason for hiding this comment

Uh oh!

sadrasabouri commented Jun 4, 2026

Uh oh!

sepandhaghighi commented Jun 4, 2026

Uh oh!

sepandhaghighi commented Jun 5, 2026

Uh oh!

sadrasabouri left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

sadrasabouri left a comment •

edited

Loading

codacy-production Bot commented May 29, 2026 •

edited

Loading

Kaylebor commented May 29, 2026 •

edited

Loading

codecov-commenter commented May 29, 2026 •

edited

Loading

sadrasabouri left a comment •

edited

Loading