Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating dependencies to latest #111

Merged
merged 4 commits into from
Apr 26, 2022
Merged

Updating dependencies to latest #111

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bef3c03
updating dependencies
chayim Apr 24, 2022
8683ec0
dependency renamed apparently
chayim Apr 24, 2022
8984ff6
psycopg2 binary
chayim Apr 25, 2022
d7e5156
Merge branch 'master' into ck-sqlalchemy-update
chayim Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ classifiers = [

[tool.poetry.dependencies]
python = "^3.6.2"
redis = "^4.1.4"
SQLAlchemy = "1.3.24"
pymongo = "4.0.1" # located here, because it achieves the same goal as sqlalchemy
redis = "^4.2.0"
SQLAlchemy = "1.4.35"
pymongo = "4.1.1" # located here, because it achieves the same goal as sqlalchemy

[tool.poetry.dev-dependencies]
flake8 = "^3.9.2"
Expand All @@ -41,7 +41,7 @@ tox-docker = "^3.0.0"
tox-pyenv = "^1.1.0"
PyMySQL = "^1.0.2"
cryptography = "^3.4.7"
psycopg2-binary = "^2.9.1"
psycopg2-binary = "^2.9.3"

[tool.pytest.ini_options]
markers = [
Expand Down
20 changes: 10 additions & 10 deletions tests/test_sqlwritebehind.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def testSimpleWriteBehind(self):
if count == 10:
self.env.assertTrue(False, message='That failed')
break
res = result.next()
res = result.fetchone()
assert res == ('1', 'foo', 'bar', 22)

self.env.execute_command('del', 'person:1')
Expand Down Expand Up @@ -76,7 +76,7 @@ def testWriteBehindAck(self):
assert res[0][1][0][1] == to_utf(['status', 'done'])

result = self.dbconn.execute(text('select * from persons'))
res = result.next()
res = result.fetchone()
assert res == ('1', 'foo', 'bar', 22)


Expand Down Expand Up @@ -123,7 +123,7 @@ def testWriteBehindOperations(self):
assert res[0][1][0][1] == to_utf(['status', 'done'])

result = self.dbconn.execute(text('select * from persons'))
res = result.next()
res = result.fetchone()
assert res == ('1', 'foo', 'bar', 22)

# delete data without replicate
Expand All @@ -136,7 +136,7 @@ def testWriteBehindOperations(self):

# make sure data is still in the dabase
result = self.dbconn.execute(text('select * from persons'))
res = result.next()
res = result.fetchone()
assert res == ('1', 'foo', 'bar', 22)

# rewrite a hash and not replicate
Expand All @@ -163,7 +163,7 @@ def testSimpleWriteThrough(self):

# make sure data is in the dabase
result = self.dbconn.execute(text('select * from persons'))
res = result.next()
res = result.fetchone()
assert res == ('1', 'foo', 'bar', 20)

assert self.env.execute_command('hgetall', 'person:1') == to_utf({'first_name':'foo', 'last_name': 'bar', 'age': '20'})
Expand All @@ -183,7 +183,7 @@ def testSimpleWriteThroughPartialUpdate(self):

# make sure data is in the dabase
result = self.dbconn.execute(text('select * from persons'))
res = result.next()
res = result.fetchone()
assert res == ('1', 'foo', 'bar', 20)

assert self.env.execute_command('hgetall', 'person:1') == to_utf({'first_name':'foo', 'last_name': 'bar', 'age': '20'})
Expand All @@ -192,7 +192,7 @@ def testSimpleWriteThroughPartialUpdate(self):

# make sure data is in the dabase
result = self.dbconn.execute(text('select * from persons'))
res = result.next()
res = result.fetchone()
assert res == ('1', 'foo1', 'bar', 20)

assert self.env.execute_command('hgetall', 'person:1') == to_utf({'first_name':'foo1', 'last_name': 'bar', 'age': '20'})
Expand Down Expand Up @@ -223,7 +223,7 @@ def testDelThroughNoReplicate(self):

# make sure data is in the dabase
result = self.dbconn.execute(text('select * from persons'))
res = result.next()
res = result.fetchone()
assert res == ('1', 'foo', 'bar', 20)

assert self.env.execute_command('hgetall', 'person:1') == to_utf({'first_name':'foo', 'last_name': 'bar', 'age': '20'})
Expand All @@ -233,7 +233,7 @@ def testDelThroughNoReplicate(self):
# make sure data was deleted from redis but not from the target
assert self.env.execute_command('hgetall', 'person:1') == {}
result = self.dbconn.execute(text('select * from persons'))
res = result.next()
res = result.fetchone()
assert res == ('1', 'foo', 'bar', 20)


Expand All @@ -253,7 +253,7 @@ def testWriteTroughAckStream(self):

# make sure data is in the dabase
result = self.dbconn.execute(text('select * from persons'))
res = result.next()
res = result.fetchone()
assert res == ('1', 'foo', 'bar', 20)

# make sure data is in redis
Expand Down