Skip to content

Commit 5f7ae48

Browse files
authored
chore: migrate to setup.cfg (#666)
closes #644 #662 #663
1 parent 9bb8499 commit 5f7ae48

14 files changed

+141
-137
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@ zookeeper/
3232
.tox
3333
/.settings
3434
/.metadata
35+
36+
!.gitignore

MANIFEST.in

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
1+
global-exclude *pyc *pyo __pycache__
2+
# Git files
3+
exclude .gitignore
4+
# CI/CD files
5+
exclude .travis.yml.bak
6+
exclude .clog.toml
7+
prune .github
8+
9+
exclude Makefile
10+
exclude run_failure.py
11+
112
include CHANGES.md
213
include CONTRIBUTING.md
314
include README.md
415
include LICENSE
516
include MANIFEST.in
6-
exclude .gitignore
7-
exclude .travis.yml
8-
exclude Makefile
9-
exclude run_failure.py
17+
18+
include tox.ini
19+
1020
recursive-include kazoo *
1121
recursive-include docs *
12-
global-exclude *pyc *pyo

constraints.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# Consistent testing environment.
2+
coverage==6.3.2
23
flake8==3.7.9
34
mock==3.0.5
45
objgraph==3.4.1
5-
pytest==4.6.9
6-
pytest-cov==2.8.1
6+
pytest-cov~=2.12
7+
pytest~=4.6
78

89
# Documentation building.
910
Jinja2==2.7.3

kazoo/tests/test_selectors_select.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import socket
99
import sys
1010
import unittest
11-
from test import support
11+
1212
from kazoo.handlers.utils import selector_select
1313

1414
select = selector_select
@@ -56,18 +56,12 @@ def test_select(self):
5656
cmd = 'for i in 0 1 2 3 4 5 6 7 8 9; do echo testing...; sleep 1; done'
5757
p = os.popen(cmd, 'r')
5858
for tout in (0, 1, 2, 4, 8, 16) + (None,) * 10:
59-
if support.verbose:
60-
print('timeout =', tout)
6159
rfd, wfd, xfd = select([p], [], [], tout)
6260
if (rfd, wfd, xfd) == ([], [], []):
6361
continue
6462
if (rfd, wfd, xfd) == ([p], [], []):
6563
line = p.readline()
66-
if support.verbose:
67-
print(repr(line))
6864
if not line:
69-
if support.verbose:
70-
print('EOF')
7165
break
7266
continue
7367
self.fail('Unexpected return values from select():', rfd, wfd, xfd)
@@ -87,5 +81,5 @@ def fileno(self):
8781
self.assertEqual(select([], a, []), ([], a[:5], []))
8882

8983

90-
def tearDownModule():
91-
support.reap_children()
84+
if __name__ == '__main__':
85+
unittest.main()

pyproject.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[build-system]
2+
build-backend = 'setuptools.build_meta'
3+
requires = [
4+
'setuptools >= 46.4.0',
5+
'wheel'
6+
]

requirements.txt

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

requirements_eventlet.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

requirements_gevent.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

requirements_sasl.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

requirements_sphinx.txt

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

0 commit comments

Comments
 (0)