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

clean up code that was only there to support Python 2.6 + avoid syntax warnings when parsing py2vs3/py.p2 with Python 3.x #3788

Merged
merged 8 commits into from
Aug 28, 2024

Conversation

Flamefire
Copy link
Contributor

@Flamefire Flamefire commented Jul 28, 2021

As Python <2.7 support was dropped in EasyBuild 4.4 (see #3715) I cleaned up the code that supports 2.6 which means removal of OrderedDict as well as some more unittest/CI code

Additionally I fixed the known issue that installing EB in Python3 shows a syntax error warning.

@Flamefire Flamefire force-pushed the python27 branch 2 times, most recently from 3acb6a5 to 5730b97 Compare July 28, 2021 13:42
@migueldiascosta migueldiascosta added this to the next release (4.4.2?) milestone Jul 29, 2021
@Flamefire Flamefire closed this Jul 29, 2021
@Flamefire Flamefire reopened this Jul 29, 2021
@Flamefire Flamefire force-pushed the python27 branch 2 times, most recently from 4448ded to d97ca5c Compare August 2, 2021 14:29
@Flamefire Flamefire closed this Aug 2, 2021
@Flamefire Flamefire reopened this Aug 2, 2021
@easybuilders easybuilders deleted a comment from boegelbot Aug 3, 2021
@easybuilders easybuilders deleted a comment from boegelbot Aug 3, 2021
requirements.txt Outdated Show resolved Hide resolved
# GitHub also supports SVN
test_repo_url = 'https://kehoste@bitbucket.org/kehoste/testrepository'

repo = HgRepository(test_repo_url)
Copy link
Member

Choose a reason for hiding this comment

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

Not testing this anymore means we should also deprecate the use of HgRepository, so we can drop support entirely in EasyBuild 5.0?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We haven't tested this for ages, I just removed the dead code. No idea if you want to deprecate this as Mercury isn't exactly dead but I don't really care. If it works why not keep it. Might add a test later or deprecate it later.

PS: I love the comment above a mercury bitbucket URL about github and SVN ;)

@boegel boegel modified the milestones: 4.4.2, release after 4.4.2 Sep 1, 2021
@easybuilders easybuilders deleted a comment from boegelbot Sep 15, 2021
@boegel boegel changed the title Fully drop support code for Python < 2.7 remove code that was required to support Python 2.6 Sep 15, 2021
@boegel boegel modified the milestones: 4.5.0, release after 4.5.0 Oct 13, 2021
requirements.txt Outdated Show resolved Hide resolved
@akesandgren
Copy link
Contributor

Apart from that I think this is good enough. @boegel do you want a deprecation warning for HgRepository?

@boegel boegel modified the milestones: 4.5.1, release after 4.5.1 Dec 7, 2021
@boegel boegel modified the milestones: 4.5.2, release after 4.5.2 Jan 14, 2022
@boegel boegel modified the milestones: 4.5.3, release after 4.5.3 Feb 8, 2022
@Flamefire
Copy link
Contributor Author

--> #4607 for 5.0x

@boegel
Copy link
Member

boegel commented Aug 13, 2024

@Flamefire With #4607 merged, I guess we can close this?

@Flamefire
Copy link
Contributor Author

Python 2.6. is not supported by EB AFAIK but the eb binary still says otherwise. This fixes it and does some IMO nice cleanup, which is easy to verify.

I'd still merge this but am fine with closing given the issues have been fixed in 5.x

@@ -37,7 +37,6 @@
import subprocess
import sys
import urllib.request as std_urllib # noqa
from collections import OrderedDict # noqa
Copy link
Member

Choose a reason for hiding this comment

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

We can't/shouldn't make a breaking change like this in EasyBuild 4.x, it will break any from easybuild.tools.py2vs3 import OrderedDict out there...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Makes sense. Reverted that change

@boegel boegel changed the title remove code that was required to support Python 2.6 clean up code that was only there to support Python 2.6 (which hasn't actually been supported for a long time) Aug 28, 2024
@boegel boegel changed the title clean up code that was only there to support Python 2.6 (which hasn't actually been supported for a long time) clean up code that was only there to support Python 2.6 + avoid syntax warnings when parsing py2vs3/py.p2 with Python 3.x Aug 28, 2024
Copy link
Member

@boegel boegel left a comment

Choose a reason for hiding this comment

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

lgtm

@boegel boegel merged commit 2882c29 into easybuilders:develop Aug 28, 2024
37 checks passed
@boegel boegel modified the milestones: 4.x, release after 4.9.2 Aug 28, 2024
@Flamefire Flamefire deleted the python27 branch August 28, 2024 12:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants