Skip to content

Commit 30c2828

Browse files
committed
Attribution and packaging
1 parent a457c1e commit 30c2828

File tree

8 files changed

+52
-172
lines changed

8 files changed

+52
-172
lines changed

LICENSE

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Apache License
32
Version 2.0, January 2004
43
http://www.apache.org/licenses/
@@ -173,4 +172,3 @@
173172
defend, and hold each Contributor harmless for any liability
174173
incurred by, or claims asserted against, such Contributor by reason
175174
of your accepting any such warranty or additional liability.
176-

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# aetcd3
22

3-
![](https://github.com/hron/etcd3aio/workflows/Build/badge.svg)
4-
5-
This project is based on [grpclib](https://github.com/vmagamedov/grpclib) and requires **Python >=3.8**.
3+
This project is based on [grpclib](https://github.com/vmagamedov/grpclib) and requires `Python >=3.8`.
64

75
* Free software: Apache Software License 2.0
86
* Documentation: https://etcd3aio.readthedocs.io.

etcd3aio/__init__.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import
2-
31
import etcd3aio.etcdrpc as etcdrpc
42
from etcd3aio.client import Etcd3Client
53
from etcd3aio.client import Transactions
@@ -9,9 +7,6 @@
97
from etcd3aio.locks import Lock
108
from etcd3aio.members import Member
119

12-
__author__ = 'Aleksei Gusev'
13-
__email__ = '[email protected]'
14-
__version__ = '0.1.0'
1510

1611
__all__ = (
1712
'etcdrpc',

requirements/base.in

Lines changed: 0 additions & 4 deletions
This file was deleted.

requirements/base.txt

Lines changed: 0 additions & 19 deletions
This file was deleted.

requirements/test.in

Lines changed: 0 additions & 18 deletions
This file was deleted.

requirements/test.txt

Lines changed: 0 additions & 77 deletions
This file was deleted.

setup.py

Lines changed: 51 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,68 @@
1-
#!/usr/bin/env python
2-
# -*- coding: utf-8 -*-
1+
import setuptools
32

4-
import re
53

6-
from setuptools import setup
4+
def _get_long_description():
5+
with open('README.md') as readme_file:
6+
return readme_file.read()
77

8-
with open('README.md') as readme_file:
9-
readme = readme_file.read()
108

11-
with open('HISTORY.rst') as history_file:
12-
history = history_file.read()
13-
14-
15-
def load_reqs(filename):
16-
with open(filename) as reqs_file:
17-
return [
18-
re.sub('==', '>=', line) for line in reqs_file.readlines()
19-
if not re.match(r'(\s*#|-r)', line)
20-
]
21-
22-
23-
requirements = load_reqs('requirements/base.txt')
24-
test_requirements = load_reqs('requirements/test.txt')
25-
26-
setup(
27-
name='etcd3aio',
28-
version='0.1.0',
29-
description="Python client for the etcd3 API for asyncio",
30-
long_description=readme + '\n\n' + history,
31-
author="Aleksei Gusev",
32-
author_email='[email protected]',
33-
url='https://github.com/hron/etcd3aio',
9+
setuptools.setup(
10+
name='aetcd3',
11+
version='0.1.0a1',
12+
description='Python asyncio based client for the etcd API v3',
13+
long_description=_get_long_description(),
14+
long_description_content_type='text/markdown',
15+
author='Andrey Martyanov',
16+
author_email='[email protected]',
17+
url='https://github.com/martyanov/aetcd3',
3418
packages=[
35-
'etcd3',
36-
'etcd3.etcdrpc',
19+
'etcd3aio',
20+
'etcd3aio.etcdrpc',
3721
],
3822
package_dir={
39-
'etcd3': 'etcd3',
40-
'etcd3.etcdrpc': 'etcd3/etcdrpc',
23+
'etcd3aio': 'etcd3aio',
24+
'etcd3aio.etcdrpc': 'etcd3aio/etcdrpc',
4125
},
4226
include_package_data=True,
43-
install_requires=requirements,
44-
license="Apache Software License 2.0",
27+
license='Apache Software License 2.0',
4528
zip_safe=False,
4629
keywords='etcd3',
4730
classifiers=[
48-
'Development Status :: 2 - Pre-Alpha',
31+
'Development Status :: 4 - Beta',
4932
'Intended Audience :: Developers',
5033
'License :: OSI Approved :: Apache Software License',
51-
'Natural Language :: English',
52-
"Programming Language :: Python :: 2",
53-
'Programming Language :: Python :: 2.7',
5434
'Programming Language :: Python :: 3',
55-
'Programming Language :: Python :: 3.4',
56-
'Programming Language :: Python :: 3.5',
57-
'Programming Language :: Python :: 3.6',
35+
'Programming Language :: Python :: 3.8',
36+
],
37+
project_urls={
38+
'Bug Reports': 'https://github.com/martyanov/aetcd3/issues',
39+
'Repository': 'https://github.com/martyanov/aetcd3',
40+
},
41+
python_requires='>=3.7,<4.0',
42+
install_requires=[
43+
'aiofiles>=0.5,<0.6',
44+
'grpclib>=0.3,<0.4',
45+
'protobuf>=3,<4',
46+
'tenacity>=5,<6',
5847
],
59-
test_suite='tests',
60-
tests_require=test_requirements
48+
extras_require={
49+
'dev': [
50+
'PyYAML==5.3.1',
51+
'Sphinx==3.1.0',
52+
'bumpversion==0.5.3',
53+
'coverage==5.1',
54+
'flake8-docstrings==1.3.0',
55+
'flake8-import-order==0.18.1',
56+
'flake8==3.8.3',
57+
'grpcio-tools==1.29.0',
58+
'twine==3.1.1',
59+
],
60+
'test': [
61+
'pifpaf==2.5.0',
62+
'pytest-asyncio==0.10.0',
63+
'pytest-cov==2.9.0',
64+
'pytest==5.4.3',
65+
'tox==3.15.2',
66+
],
67+
},
6168
)

0 commit comments

Comments
 (0)