Skip to content

Commit c038364

Browse files
committed
Merge branch 'master' into sandbox-no-conda
2 parents 14fa2a4 + 94fbaba commit c038364

File tree

5 files changed

+60
-3
lines changed

5 files changed

+60
-3
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
CONDA_ENV: [py39, py310, py311, py312]
16+
CONDA_ENV: [py39, py310, py311, py312, py313, py314]
1717
# env:
1818
# STREAMZ_LAUNCH_KAFKA: true
1919

ci/environment-py313.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: test_env
2+
channels:
3+
- conda-forge
4+
- defaults
5+
dependencies:
6+
- python=3.13
7+
- pytest
8+
- flake8
9+
- black
10+
- isort
11+
- tornado
12+
- toolz
13+
- librdkafka
14+
- dask
15+
- distributed
16+
- pandas
17+
- python-confluent-kafka
18+
- codecov
19+
- coverage
20+
- networkx
21+
- graphviz
22+
- pytest-asyncio
23+
- python-graphviz
24+
- bokeh
25+
- ipywidgets
26+
- flaky
27+
- pytest-cov

ci/environment-py314.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: test_env
2+
channels:
3+
- conda-forge
4+
- defaults
5+
dependencies:
6+
- python=3.14
7+
- pytest
8+
- flake8
9+
- black
10+
- isort
11+
- tornado
12+
- toolz
13+
- librdkafka
14+
- dask
15+
- distributed
16+
- pandas
17+
- python-confluent-kafka
18+
- codecov
19+
- coverage
20+
- networkx
21+
- graphviz
22+
- pytest-asyncio
23+
- python-graphviz
24+
- bokeh
25+
- ipywidgets
26+
- flaky
27+
- pytest-cov

streamz/orderedweakset.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ def add(self, value):
2626
def discard(self, value):
2727
self._od.pop(value, None)
2828

29+
def copy(self):
30+
return OrderedSet(self._od.copy())
31+
2932

3033
class OrderedWeakrefSet(weakref.WeakSet):
3134
def __init__(self, values=()):

streamz/tests/test_sources.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def test_http():
103103
def test_process():
104104
cmd = ["python", "-c", "for i in range(4): print(i, end='')"]
105105
s = Source.from_process(cmd, with_end=True)
106-
if sys.platform != "win32":
106+
if sys.platform != "win32" and sys.version_info < (3, 14):
107107
# don't know why - something with pytest and new processes
108108
policy = asyncio.get_event_loop_policy()
109109
watcher = asyncio.SafeChildWatcher()
@@ -119,7 +119,7 @@ def test_process():
119119
def test_process_str():
120120
cmd = 'python -c "for i in range(4): print(i)"'
121121
s = Source.from_process(cmd)
122-
if sys.platform != "win32":
122+
if sys.platform != "win32" and sys.version_info < (3, 14):
123123
# don't know why - something with pytest and new processes
124124
policy = asyncio.get_event_loop_policy()
125125
watcher = asyncio.SafeChildWatcher()

0 commit comments

Comments
 (0)