Skip to content

Remove vendored six.py and dependencies on it. #11979

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.

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
merged 10 commits into from
Oct 19, 2022
Merged

Conversation

erykoff
Copy link
Contributor

@erykoff erykoff commented Oct 14, 2022

Description

This is an attempt to remove the vendored six.py and update remaining compatibility dependencies on it.

The tricky thing is that some of the six functions are exported for use in (e.g.) conda-build: https://github.com/conda/conda-build/blob/main/conda_build/conda_interface.py#L71-L72 I have updated these for py3 only, but this may not be the best option; feedback welcome. It may be worthwhile to add a deprecation to exported iteritems()?

Also, I would not be shocked if the first run through CI with this PR doesn't work.

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

@erykoff erykoff requested a review from a team as a code owner October 14, 2022 18:49
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Oct 14, 2022
@dholth
Copy link
Contributor

dholth commented Oct 14, 2022

Thank you!

@erykoff
Copy link
Contributor Author

erykoff commented Oct 14, 2022

Any idea on the failed macos test?

@dholth
Copy link
Contributor

dholth commented Oct 14, 2022 via email

@dholth dholth self-requested a review October 14, 2022 20:51
Copy link
Contributor

@dholth dholth left a comment

Choose a reason for hiding this comment

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

Thanks!

@travishathaway travishathaway merged commit 8582b21 into conda:main Oct 19, 2022
jeskowagner pushed a commit to jeskowagner/conda that referenced this pull request Nov 9, 2022
* Remove six dependency from compat.py.

* Replace six.wraps with py3 functools.wraps.

* Remove dependency on six and replace with py3 types.

* Remove six dependency and replace with py3 types.

* Replace six exports with native types.

These exports are maintained for compatibility with conda-build and other downstream
products which might depend on them.

* Remove vendored six.py.

* Fix primitive_types.

* Remove six license file and remove six from vendor.txt.

* Remove unused chain import.

* Add news fragment.
@github-actions github-actions bot added the locked [bot] locked due to inactivity label Oct 20, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 20, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla-signed [bot] added once the contributor has signed the CLA locked [bot] locked due to inactivity
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants