Skip to content

Make sure auto-discovery does not break include_package_data#3202

Merged
abravalheri merged 3 commits into
pypa:mainfrom
abravalheri:issue-3196
Mar 25, 2022
Merged

Make sure auto-discovery does not break include_package_data#3202
abravalheri merged 3 commits into
pypa:mainfrom
abravalheri:issue-3196

Conversation

@abravalheri

Copy link
Copy Markdown
Contributor

This is an attempt to fix #3196

Summary of changes

  • Avoid auto-discovery to add entries to package_dir in flat-layouts
  • Avoid using paths starting with ./ in package_dir

Closes

Pull Request Checklist

@blink1073

Copy link
Copy Markdown

I confirmed this fixes jupyter_releaser, but I can't test this with jupyter_server due to a dependency conflict:

 The user requested setuptools 61.0.0.post20220325.post-20220325 (from git+https://github.com/abravalheri/setuptools.git@issue-3196)
    jupyter-packaging 0.9.0 depends on setuptools>=49.4.0

@blink1073 blink1073 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@abravalheri

abravalheri commented Mar 25, 2022

Copy link
Copy Markdown
Contributor Author

I can't test this with jupyter_server due to a dependency conflict:

Yes I experienced the same trouble here locally when trying to test jupyter_server. Then after a workaround, I found some other problems related to npm... Then I finally gave up 😅

Hopefully it will work.

Thank you very much Steven for checking the PR!

@abravalheri abravalheri linked an issue Mar 25, 2022 that may be closed by this pull request
@blink1073

Copy link
Copy Markdown

I found some other problems related to npm... Then I finally gave up 😅

Haha good call, the bane of Jupyter-development.

@abravalheri abravalheri merged commit c3c9c97 into pypa:main Mar 25, 2022
@abravalheri abravalheri deleted the issue-3196 branch March 25, 2022 15:17
@abravalheri

Copy link
Copy Markdown
Contributor Author

Haha good call, the bane of Jupyter-development.

Sorry 😝, I promise I will get back to it soon.

@blink1073

Copy link
Copy Markdown

No worries, I'll double-check once a patch release is out.

@blink1073

Copy link
Copy Markdown

We already merged jupyter-server/jupyter_server#757 as a workaround anyway, but I'll make sure it works without that patch.

@abravalheri

Copy link
Copy Markdown
Contributor Author

Thank you very much for the help and the understanding.

@kosteev

kosteev commented Mar 25, 2022

Copy link
Copy Markdown

We have our CI pipelines broken because of this and while we are working on the fix on our side we are curious if there is an ETA for releasing this fix?

@abravalheri

Copy link
Copy Markdown
Contributor Author

Hi @kosteev, being optimistic, if Github actions/hooks don't go bad again I hope to get the first batch of fixes out still today (I am at UTC).

@kosteev

kosteev commented Mar 25, 2022

Copy link
Copy Markdown

Thank you!

@MetRonnie

Copy link
Copy Markdown
Contributor

I had the same problem as the original issue (only affected Python 3.7 on GH Actions, couldn't reproduce locally). Anyway, I have tested this fix out by pip installing setuptools from the GH repo instead of PyPI and can confirm the problem is fixed 👍 (for me at least)

@blink1073

blink1073 commented Mar 25, 2022

Copy link
Copy Markdown

v61.1.0 fixes the issue in jupyter_server. Thanks again for the hard work and quick fixes @abravalheri, have a great weekend!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] Package Dir is No Longer Optional [BUG] Package data missing with Setuptools 61

4 participants