Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ddelange/pipgrip into fixes
Browse files Browse the repository at this point in the history
* 'master' of https://github.com/ddelange/pipgrip:
  ➕ Add backports for enum and typing modules (#7)
  💚 Upgrade GitHub actions/checkout@v1 --> v2 (#5)
  • Loading branch information
ddelange committed Jan 22, 2020
2 parents 792ff49 + 0f85617 commit 445a3d5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: GH

on: [push]
on: [push, pull_request]

jobs:
CI:
Expand All @@ -10,7 +10,7 @@ jobs:
matrix:
python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Set up Python 3.8
uses: actions/setup-python@v1
Expand Down
2 changes: 2 additions & 0 deletions requirements/prod.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ packaging>=17
pkginfo>=1.4.2
setuptools>=38.3 # for pkg_resources
wheel
enum34; python_version=='2.7'
typing; python_version=='2.7'
2 changes: 1 addition & 1 deletion src/pipgrip/pipper.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def _download_wheel(package, index_url, extra_index_url, pre, cache_dir):
raise
out = out.decode("utf-8").splitlines()[::-1]
for i, line in enumerate(out):
if cache_dir in line or abs_cache_dir in line:
if cache_dir in line or abs_cache_dir in line or "ephem-wheel-cache" in line:
if line.strip().startswith("Stored in directory"):
# wheel was built
fname = [
Expand Down

0 comments on commit 445a3d5

Please sign in to comment.