Skip to content

Commit

Permalink
Merge pull request #58 from nrccua/DS-176-hard-code-redis-install-to-…
Browse files Browse the repository at this point in the history
…3-5-3

Fix redis issue with update to 4.X.
  • Loading branch information
nrccua-timr authored Nov 30, 2021
2 parents 8eaf76c + 45e16b1 commit 7a3d4a8
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 13 deletions.
12 changes: 12 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@ History
=======


v0.15.6 (2021-11-30)

* Hard-code redis==3.5.3.
* Update ddtrace==0.56.0.
* Update fakeredis==1.7.0.
* Update moto==2.2.17.
* Update numpy==1.21.4.
* Update psycopg2-binary==2.9.2.
* Update pylint==2.12.1.
* Update twine==3.6.0.


v0.15.5 (2021-11-02)

* Fix import of establish_pyodbc_connection to not check sys.modules for pyodbc.
Expand Down
14 changes: 7 additions & 7 deletions aioradio/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ aioboto3==9.2.2
aiobotocore==1.4.2
aiojobs==0.3.0
boto3==1.17.106
ddtrace==0.54.1
fakeredis==1.6.1
ddtrace==0.56.0
fakeredis==1.7.0
flask==2.0.2
flask-cors==3.0.10
httpx==0.20.0
mandrill==1.0.60
moto==2.2.10
numpy==1.21.2
moto==2.2.17
numpy==1.21.4
orjson==3.6.4
pre-commit==2.15.0
psycopg2-binary==2.9.1
pylint==2.11.1
psycopg2-binary==2.9.2
pylint==2.12.1
pyodbc==4.0.32
pysmb==1.2.7
pytest==6.2.5
pytest-asyncio==0.15.1
pytest-cov==3.0.0
python-json-logger==2.0.2
redis==3.5.3
twine==3.4.2
twine==3.6.0
wheel==0.37.0
3 changes: 2 additions & 1 deletion conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,8 @@ async def sqs_queue_url(sqs_client):

async def _f(region_name, queue_name):
nonlocal _queue_url
response = await sqs_client.create_queue(QueueName=queue_name)
fifo = "true" if queue_name.lower().endswith('.fifo') else "false"
response = await sqs_client.create_queue(QueueName=queue_name, Attributes={"FifoQueue": fifo})
queue_url = response['QueueUrl']
_queue_url = queue_url
assert_status_code(response, 200)
Expand Down
10 changes: 5 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
long_description = fileobj.read()

setup(name='aioradio',
version='0.15.5',
version='0.15.6',
description='Generic asynchronous i/o python utilities for AWS services (SQS, S3, DynamoDB, Secrets Manager), Redis, MSSQL (pyodbc), JIRA and more',
long_description=long_description,
long_description_content_type="text/markdown",
Expand All @@ -23,16 +23,16 @@
'aiobotocore>=1.4.2',
'aiojobs>=0.3.0',
'boto3==1.17.106',
'ddtrace>=0.54.1',
'fakeredis>=1.6.1',
'ddtrace>=0.56.0',
'fakeredis>=1.7.0',
'httpx>=0.19.0',
'mandrill>=1.0.60',
'numpy>=1.19',
'orjson>=3.6.4',
'psycopg2-binary==2.9.1',
'psycopg2-binary==2.9.2',
'pysmb>=1.2.7',
'python-json-logger>=2.0.2',
'redis>=3.5.3',
'redis==3.5.3',
'xlrd==2.0.1'
],
include_package_data=True,
Expand Down

0 comments on commit 7a3d4a8

Please sign in to comment.