Skip to content

Commit

Permalink
Version 2.1.9
Browse files Browse the repository at this point in the history
  • Loading branch information
mminichino committed Dec 20, 2023
1 parent c998635 commit 302f891
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.1.8
current_version = 2.1.9
commit = False
tag = False
message = 'Version {new_version}'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cb-util 2.1.8
# cb-util 2.1.9

## Couchbase Utilities
Couchbase connection manager. Simplifies connecting to a Couchbase cluster and performing data and management operations.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.8
2.1.9
2 changes: 1 addition & 1 deletion cbcmgr/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from pkg_resources import parse_version

_ROOT = os.path.abspath(os.path.dirname(__file__))
__version__ = "2.1.8"
__version__ = "2.1.9"
VERSION = parse_version(__version__)


Expand Down
2 changes: 1 addition & 1 deletion cbcmgr/async_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ async def dispatch(self, keyspace: str, op: Operation, *args):

async def join(self):
if len(self.tasks) > 0:
await asyncio.sleep(0)
await asyncio.sleep(1)
results = await asyncio.gather(*self.tasks, return_exceptions=True)
for result in results:
if isinstance(result, Exception):
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
attrs==23.1.0
couchbase>=4.1.8
couchbase>=4.1.9
dnspython==2.3.0
docker==6.1.3
pytest==7.4.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
package_data={'cbcmgr': ['data/*']},
install_requires=[
"attrs>=22.2.0",
"couchbase>=4.1.8",
"couchbase>=4.1.9",
"dnspython>=2.3.0",
"docker>=5.0.3",
"pytest>=7.0.1",
Expand Down
4 changes: 4 additions & 0 deletions tests/test_1.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,13 @@ def setup_class(cls):
time.sleep(1)
command = ['cbcutil', 'list', '--host', '127.0.0.1', '--wait']
run_in_container(cls.container_id, command)
time.sleep(1)

@classmethod
def teardown_class(cls):
print("Stopping test container")
stop_container(cls.container_id)
time.sleep(1)

@pytest.mark.parametrize("hostname", ["127.0.0.1"])
@pytest.mark.parametrize("bucket", ["test"])
Expand Down Expand Up @@ -217,11 +219,13 @@ def setup_class(cls):
time.sleep(1)
command = ['cbcutil', 'list', '--host', '127.0.0.1', '--wait']
run_in_container(cls.container_id, command)
time.sleep(1)

@classmethod
def teardown_class(cls):
print("Stopping test container")
stop_container(cls.container_id)
time.sleep(1)

@pytest.mark.parametrize("hostname", ["127.0.0.1"])
@pytest.mark.parametrize("bucket", ["test"])
Expand Down
4 changes: 3 additions & 1 deletion tests/test_2.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,13 @@ def setup_class(cls):
time.sleep(1)
command = ['cbcutil', 'list', '--host', '127.0.0.1', '--wait']
run_in_container(cls.container_id, command)
time.sleep(1)

@classmethod
def teardown_class(cls):
print("Stopping test container")
stop_container(cls.container_id)
time.sleep(1)

@pytest.mark.parametrize("hostname", ["127.0.0.1"])
@pytest.mark.parametrize("bucket", ["test"])
Expand All @@ -151,7 +153,7 @@ def teardown_class(cls):
@pytest.mark.parametrize("tls", [False, True])
@pytest.mark.asyncio
async def test_1(self, hostname, bucket, tls, scope, collection):
pool = CBPoolAsync(hostname, "Administrator", "password", ssl=False, quota=128, create=True, replicas=0)
pool = CBPoolAsync(hostname, "Administrator", "password", ssl=tls, quota=128, create=True, replicas=0)

for n in range(10):
c = string.ascii_lowercase[n:n + 1]
Expand Down

0 comments on commit 302f891

Please sign in to comment.