Skip to content

Commit

Permalink
Merge pull request #9 from fscherf/fscherf/github/setup-artifacts
Browse files Browse the repository at this point in the history
Fscherf/GitHub/setup artifacts
  • Loading branch information
fscherf authored Feb 10, 2024
2 parents e055150 + 958b86d commit 75ffac5
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 7 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,9 @@ jobs:
uses: codecov/codecov-action@v3
with:
file: ./coverage.xml

- name: Upload artifacts to GitHub
uses: actions/upload-artifact@v4
with:
name: python-${{ matrix.python-version }}-artifacts
path: tests/artifacts
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ test: | $(PYTHON_ENV)

ci-test: | $(PYTHON_ENV)
. $(PYTHON_ENV)/bin/activate && \
MILAN_CI_TEST=1 tox $(args)
MILAN_CI_TEST=1 tox -e py38,py39,py310,py311 $(args)

frontend: | $(PYTHON_ENV)
. $(PYTHON_ENV)/bin/activate && \
Expand Down
11 changes: 9 additions & 2 deletions milan/utils/json_rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import asyncio
import queue
import json
import sys
import os

from aiohttp import ClientSession, WSMsgType
Expand Down Expand Up @@ -417,8 +418,14 @@ def __init__(self, loop, url):
self._stopped = asyncio.Future(loop=self.loop)
self._websocket_open = asyncio.Future(loop=self.loop)
self._websocket = None
self._read_queue = asyncio.Queue()
self._write_queue = asyncio.Queue()

if sys.version_info < (3, 10):
self._read_queue = asyncio.Queue(loop=self.loop)
self._write_queue = asyncio.Queue(loop=self.loop)

else:
self._read_queue = asyncio.Queue()
self._write_queue = asyncio.Queue()

self.loop.create_task(coro=self._handle_read_queue())
self.loop.create_task(coro=self._handle_write_queue())
Expand Down
1 change: 1 addition & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ log_cli = false
log_level = NOTSET
log_format = %(levelname)-8s %(name)-30s [%(asctime)s.%(msecs)03d] %(message)s
log_date_format = %H:%M:%S
timeout = 300
4 changes: 0 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ skip_missing_interpreters = True
envlist = py310


[tox:jenkins]
envlist = lint,py38,py39,py310,py311


[testenv]
passenv =
MILAN_*
Expand Down

0 comments on commit 75ffac5

Please sign in to comment.