Skip to content

Commit

Permalink
fix test dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
cloud-rocket committed Sep 29, 2023
1 parent 2501fb9 commit 7eef5c3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ jobs:
needs: prepare
services:
rabbitmq:
image: docker://mosquito/aiormq-rabbitmq
image: rabbitmq:3.9
ports:
- 5672:5672
- 5671:5671
strategy:
matrix:
python:
- "3.8" # oldest Python supported by PSF
- "3.11" # newest Python that is stable
# - "3.11" # newest Python that is stable
platform:
- ubuntu-latest
# - windows-latest
Expand Down
6 changes: 4 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ install_requires =
importlib-metadata; python_version<"3.8"
confuse
pandas
aiomisc
aiodebug
apscheduler==3.9.1
cachetools
Expand All @@ -42,9 +43,9 @@ install_requires =
# The usage of test_requires is discouraged, see `Dependency Management` docs
tests_require =
pytest
pytest-covgit
pytest-cov
pytest-asyncio
pytest-mock
aiomisc-pytest
coverage

# Require a specific Python version, e.g. Python 2.7 or >= 3.4
Expand All @@ -64,6 +65,7 @@ testing =
setuptools
pytest
pytest-cov
pytest-asyncio

[options.entry_points]
console_scripts =
Expand Down
9 changes: 1 addition & 8 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from data_agent.exchanger import DataExchanger
from data_agent.safe_manipulator import SafeManipulator

AMQP_URL = os.environ.get("BROKER_URL", "amqp://guest:guest@127.0.0.1/")
AMQP_URL = os.environ.get("BROKER_URL", "amqp://guest:guest@localhost/")
SERVICE_ID = os.environ.get("SERVICE_ID", "test-agent")
SERVICE_TYPE = os.environ.get("SERVICE_TYPE", "no-type")
SERVICE_DOMAIN = os.environ.get("SERVICE_DOMAIN", "some-domain")
Expand Down Expand Up @@ -79,13 +79,6 @@ def data_exchanger(connection_manager):
yield data_exchanger


@pytest.fixture
def event_loop():
loop = asyncio.get_event_loop()
yield loop
loop.close()


@pytest.fixture
async def broker_conn():
conn = await connect_robust(
Expand Down

0 comments on commit 7eef5c3

Please sign in to comment.