Skip to content

Commit

Permalink
enable CI on rewrite (#1445)
Browse files Browse the repository at this point in the history
Signed-off-by: Bernat Gabor <[email protected]>
  • Loading branch information
gaborbernat committed Nov 22, 2019
1 parent 77dc2eb commit 69387c4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
6 changes: 4 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ jobs:
cross_python2: null
cross_python3: null
docs: null
py38:
image: [linux, windows, macOs]
py37:
image: [linux, windows, macOs]
py36:
Expand All @@ -48,10 +50,10 @@ jobs:
package_readme: null
before:
- script: 'sudo apt-get update -y && sudo apt-get install fish csh'
condition: and(succeeded(), eq(variables['image_name'], 'linux'), in(variables['TOXENV'], 'py37', 'py36', 'py35', 'py34', 'py27'))
condition: and(succeeded(), eq(variables['image_name'], 'linux'), in(variables['TOXENV'], 'py38', 'py37', 'py36', 'py35', 'py34', 'py27'))
displayName: install fish and csh via apt-get
- script: 'brew update -vvv && brew install fish tcsh'
condition: and(succeeded(), eq(variables['image_name'], 'macOs'), in(variables['TOXENV'], 'py37', 'py36', 'py35', 'py34', 'py27'))
condition: and(succeeded(), eq(variables['image_name'], 'macOs'), in(variables['TOXENV'], 'py38', 'py37', 'py36', 'py35', 'py34', 'py27'))
displayName: install fish and csh via brew
coverage:
with_toxenv: 'coverage' # generate .tox/.coverage, .tox/coverage.xml after test run
Expand Down
8 changes: 6 additions & 2 deletions virtualenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -990,8 +990,12 @@ def find_wheels(projects, search_dirs):
# The pattern could be tightened to require -py2.py3-none-any.whl.
files = glob.glob(os.path.join(dirname, "{}-*.whl".format(project)))
if files:
versions = sorted(
[(tuple(int(i) for i in os.path.basename(f).split("-")[1].split(".")), f) for f in files]
versions = list(
reversed(
sorted(
[(tuple(int(i) for i in os.path.basename(f).split("-")[1].split(".")), f) for f in files]
)
)
)
if project == "pip" and sys.version_info[0:2] == (3, 4):
wheel = next(p for v, p in versions if v <= (19, 1, 1))
Expand Down

0 comments on commit 69387c4

Please sign in to comment.