Skip to content

Commit

Permalink
Get rid of bad PyYAML workarounds
Browse files Browse the repository at this point in the history
Document that PyYAML has to be installed separately for now.
  • Loading branch information
briancurtin committed Mar 8, 2018
1 parent b02aa30 commit c329f04
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ Installation

Under normal circumstances you would just do ``pip install pine``.

However, until PyYAML supports Python 3.7 in a released version, ``pip``
needs one extra argument so we can install PyYAML from GitHub::
However, until PyYAML supports Python 3.7 in a released version, one
extra step is required so we can install PyYAML from GitHub::

pip install --process-dependency-links pine
pip install git+https://github.com/yaml/pyyaml.git

https://github.com/briancurtin/pine/issues/1 and
https://github.com/yaml/pyyaml/issues/126 are tracking this issue.
Expand Down
6 changes: 3 additions & 3 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Installation

Under normal circumstances you would just do ``pip install pine``.

However, until PyYAML supports Python 3.7 in a released version, ``pip``
needs one extra argument so we can install PyYAML from GitHub::
However, until PyYAML supports Python 3.7 in a released version, one
extra step is required so we can install PyYAML from GitHub::

pip install --process-dependency-links pine
pip install git+https://github.com/yaml/pyyaml.git

This will install the ``pine`` script for you to use. If you're installing
this inside a virtualenv, it'll be in the ``/bin`` folder of that virtualenv.
Expand Down
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,13 @@
"Topic :: Software Development :: Libraries :: Python Modules",
]

# We shouldn't have to do this, but dependency_links, current PyYAML,
# and just generally distributing code in Python are all broken.
subprocess.run(["pip", "install", "git+https://github.com/yaml/pyyaml.git"])

if __name__ == "__main__":
setup(
name="pine",
description="A benchmark utility to make requests to a REST API.",
license="Apache 2",
url="http://pine.readthedocs.io/en/latest/",
version="0.4",
version="0.5",
author=NAME,
author_email=EMAIL,
maintainer=NAME,
Expand All @@ -43,5 +39,8 @@
install_requires=[
"aiohttp>=3.0",
"certifi>=2018.1.18",
# Until PyYAML comes out with 3.13 it needs to be installed
# separately:
# pip install git+https://github.com/yaml/pyyaml.git
],
)

0 comments on commit c329f04

Please sign in to comment.