Skip to content

Commit

Permalink
Merge pull request #147 from Fusl/fix-145
Browse files Browse the repository at this point in the history
Remove use of now-unavailable --process-dependency-links
  • Loading branch information
ivan committed Feb 12, 2019
2 parents 5cbce99 + fe814bf commit 502eccb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ before_install:

install:
- travis_retry pip install --upgrade pip setuptools
- travis_retry pip install --process-dependency-links --no-binary --upgrade .
- travis_retry pip install --no-binary --upgrade .

script:
- ./tests/offline-tests
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,9 @@ chmod +x pyenv-installer
./pyenv-installer
~/.pyenv/bin/pyenv install 3.7.1
~/.pyenv/versions/3.7.1/bin/python -m venv ~/gs-venv
~/gs-venv/bin/pip install --process-dependency-links --no-binary --upgrade git+https://github.com/ludios/grab-site
~/gs-venv/bin/pip install --no-binary --upgrade git+https://github.com/ludios/grab-site
```

`--process-dependency-links` is necessary to get [ludios/wpull](https://github.com/ludios/wpull) instead of wpull from PyPI.

`--no-binary` is necessary for the html5-parser build.

Add this to your `~/.bashrc` or `~/.zshrc` and then restart your shell (e.g. by opening a new terminal tab/window):
Expand Down Expand Up @@ -149,7 +147,7 @@ On OS X 10.10 - macOS 10.13:
brew update
brew install python libxslt re2 pkg-config
python3 -m venv ~/gs-venv
~/gs-venv/bin/pip install --process-dependency-links --no-binary --upgrade git+https://github.com/ludios/grab-site
~/gs-venv/bin/pip install --no-binary --upgrade git+https://github.com/ludios/grab-site
```

4. Add this to your `~/.bash_profile` (which may not exist yet) and then restart your shell (e.g. by opening a new terminal tab/window):
Expand Down
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

install_requires = [
"click>=6.3",
"wpull==3.0.7",
"wpull @ https://github.com/ludios/wpull/tarball/master#egg=wpull-3.0.7",
"manhole>=1.0.0",
"lmdb>=0.89",
"autobahn>=0.12.1",
Expand Down Expand Up @@ -40,7 +40,4 @@
packages=["libgrabsite"],
package_data={"libgrabsite": ["*.html", "*.ico", "*.txt", "ignore_sets/*"]},
install_requires=install_requires,
dependency_links=[
"https://github.com/ludios/wpull/tarball/master#egg=wpull-3.0.7",
]
)

0 comments on commit 502eccb

Please sign in to comment.