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

Skip alwayscopy tests for SuSE #753

Merged
merged 5 commits into from
Feb 2, 2018
Merged

Conversation

ederag
Copy link

@ederag ederag commented Jan 27, 2018

This is a fix to issue #752.
Now tox succeeds (with python versions: py27, py34, py36).
a priori the i686 arch should be able to run, so skip test_alwayscopy only for the x86-64 arch.

@ederag ederag changed the title Alwayscopy su se Alwayscopy for SuSE Jan 27, 2018
@ederag ederag changed the title Alwayscopy for SuSE skip alwayscopy tests for SuSE Jan 27, 2018
@ederag ederag changed the title skip alwayscopy tests for SuSE Skip alwayscopy tests for SuSE Jan 27, 2018
@codecov
Copy link

codecov bot commented Jan 27, 2018

Codecov Report

Merging #753 into master will increase coverage by 0.04%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #753      +/-   ##
==========================================
+ Coverage    94.8%   94.84%   +0.04%     
==========================================
  Files          11       11              
  Lines        2386     2386              
==========================================
+ Hits         2262     2263       +1     
+ Misses        124      123       -1
Impacted Files Coverage Δ
tox/_verlib.py 83.15% <0%> (+1.05%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 68546bc...8181e5d. Read the comment docs.

@@ -635,7 +635,11 @@ def _alwayscopy_not_supported():
# see: https://github.com/pypa/virtualenv/issues/565
if hasattr(platform, 'linux_distribution'):
_dist = platform.linux_distribution(full_distribution_name=False)
if _dist[0] == 'centos' and _dist[1][0] == '7':
(name, version, arch) = _dist
if (
Copy link
Member

Choose a reason for hiding this comment

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

this formatting looks akward, maybe instead use the any with two args, one per line 👍

Copy link
Author

Choose a reason for hiding this comment

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

Nice trick !

@@ -635,7 +635,11 @@ def _alwayscopy_not_supported():
# see: https://github.com/pypa/virtualenv/issues/565
if hasattr(platform, 'linux_distribution'):
_dist = platform.linux_distribution(full_distribution_name=False)
if _dist[0] == 'centos' and _dist[1][0] == '7':
(name, version, arch) = _dist
if any((
Copy link
Member

Choose a reason for hiding this comment

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

what I meant

        if any(( name == 'centos' and version[0] == '7',
                 name == 'SuSE' and arch == 'x86_64' )):

Copy link
Author

@ederag ederag Jan 30, 2018

Choose a reason for hiding this comment

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

The current state is closer to this pep8 recommendation:

FILES = [
    'setup.cfg',
    'tox.ini',
    ]

This makes suppressions very clear to read in the logs. (1 suppression: 1 line).
But just confirm your preference and I'll update accordingly.

Copy link
Member

Choose a reason for hiding this comment

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

I tend to disagree with that, so I would go to change it to be more readable 🤔

Copy link
Author

Choose a reason for hiding this comment

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

Well, then this is a matter of taste ;-)
So your code was copy/pasted, but failed fix-lint. Had to remove few spaces.

Copy link
Member

@gaborbernat gaborbernat left a comment

Choose a reason for hiding this comment

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

as noted above

@gaborbernat gaborbernat merged commit a65a1c1 into tox-dev:master Feb 2, 2018
@ederag ederag deleted the alwayscopySuSE branch February 2, 2018 17:34
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.

None yet

2 participants