Skip to content
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

Make Toolshed Python 3 compatible & tests #9528

Merged
merged 27 commits into from
Apr 12, 2020

Conversation

mvdbeek
Copy link
Member

@mvdbeek mvdbeek commented Mar 16, 2020

Hardest part was to fix twill. My fork now passes all tests (https://github.com/mvdbeek/twill3), and I think they had been broken for many years.
Most of the Galaxy / Toolshed changes are standard bytestring / unicode issues. In particular mercurial functions expect bytestring input and return bytestrings as output.

Also moves the toolshed tests to github CI.

Close #1715 .

@mvdbeek mvdbeek added kind/bug kind/refactoring cleanup or refactoring of existing code, no functional changes area/testing area/toolshed area/python3 Specific to Python 3 labels Mar 16, 2020
@galaxybot galaxybot added this to the 20.05 milestone Mar 16, 2020
@mvdbeek

This comment has been minimized.

@mvdbeek
Copy link
Member Author

mvdbeek commented Apr 2, 2020

Alright, after b2850ea which fixes a silly bug I introduced the tests are passing with upstream twill. So I guess this is ready to be reviewed.

@nsoranzo
Copy link
Member

nsoranzo commented Apr 3, 2020

Unfortunately this needs a rebase now.

lib/galaxy/tool_shed/util/hg_util.py Outdated Show resolved Hide resolved
lib/tool_shed/test/base/twilltestcase.py Outdated Show resolved Hide resolved
lib/tool_shed/test/base/twilltestcase.py Show resolved Hide resolved
@nsoranzo
Copy link
Member

I've rebased the PR, condensing the changes to lib/galaxy/dependencies/pipfiles/default/ in a single commit.
@mvdbeek Can you check if the commits I've added are OK with you?

@nsoranzo nsoranzo merged commit c11dee5 into galaxyproject:dev Apr 12, 2020
@nsoranzo nsoranzo deleted the twill_work branch April 12, 2020 19:52
@nsoranzo
Copy link
Member

Thanks @mvdbeek, finally closing #1715 is a nice Easter present!

@mvdbeek mvdbeek added the major label Jun 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/python3 Specific to Python 3 area/testing area/toolshed kind/bug kind/refactoring cleanup or refactoring of existing code, no functional changes major
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Python 3 support.
4 participants