Skip to content

Commit

Permalink
fighting with stupid setup.py
Browse files Browse the repository at this point in the history
  • Loading branch information
revol.cai committed Mar 18, 2018
1 parent d2c4500 commit 19313fd
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ etcd3-py
Python client for etcd v3 (Using gRPC-JSON-Gateway)

* Free software: Apache Software License 2.0
* Source Code: https://github.com/Revolution1/etcd3-py
* Documentation: https://etcd3-py.readthedocs.io.

Notice: The authentication header through gRPC-JSON-Gateway only supported in [etcd v3.3+](https://github.com/coreos/etcd/pull/7999)
Expand Down
20 changes: 14 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@
history = history_file.read()

# parse_requirements() returns generator of pip.req.InstallRequirement objects
if PY2:
install_reqs = parse_requirements('requirements.txt', session='')
else:
install_reqs = parse_requirements('requirements_py3.txt', session='')
# if PY2:
# install_reqs = parse_requirements('requirements.txt', session='')
# else:
# install_reqs = parse_requirements('requirements_py3.txt', session='')

install_reqs = parse_requirements('requirements.txt', session='')

# reqs is a list of requirement
requirements = [str(ir.req) for ir in install_reqs]
Expand All @@ -42,7 +44,7 @@
setup(
name='etcd3-py',
version='0.1.1',
description="Python client for etcd v3 (Using grpc-json-gateway) Edit",
description="Python client for etcd v3 (Using gRPC-JSON-Gateway)",
long_description=readme + '\n\n' + history,
author="Renjie Cai",
author_email='revol.cai@gmail.com',
Expand All @@ -59,10 +61,11 @@
include_package_data=True,
install_requires=requirements,
license="Apache Software License 2.0",
python_requires='>=2.7',
zip_safe=False,
keywords='etcd3',
classifiers=[
'Development Status :: 2 - Pre-Alpha',
'Development Status :: 3 - Alpha',
'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'Natural Language :: English',
Expand All @@ -73,4 +76,9 @@
test_suite='tests',
tests_require=test_requirements,
setup_requires=setup_requirements,
extras_require={
':python_version >= "3.5"': [
'aiohttp',
],
},
)

0 comments on commit 19313fd

Please sign in to comment.