Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/.github/CODEOWNERS @neo4j/drivers
/.github/workflows/ @neo4j/drivers
57 changes: 57 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Tests

on:
push:
branches:
- '5.0'
pull_request:
branches:
- '5.0'

jobs:
win-unit-tests:
name: Windows Unit Tests
runs-on: windows-latest
strategy:
matrix:
python-version:
- semver: '3.7'
tox-factor: 'py37'
- semver: '3.8'
tox-factor: 'py38'
- semver: '3.9'
tox-factor: 'py39'
- semver: '3.10'
tox-factor: 'py310'
- semver: '3.11'
tox-factor: 'py311'
- semver: '3.12'
tox-factor: 'py312'
- semver: '3.13'
tox-factor: 'py313'
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

- name: Set up Python ${{ matrix.python-version.semver }}
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
with:
python-version: ${{ matrix.python-version.semver }}
cache: 'pip'
- name: Install tox
run: python -m pip install -U tox>=4.8.0
- name: Run unit tests
run: python -m tox -vv -f unit ${{ matrix.python-version.tox-factor }}

gha-conclusion:
name: gha-conclusion
needs: win-unit-tests
runs-on: ubuntu-latest
steps:
- name: Signal failure
if: ${{ cancelled() || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'failure') }}
run: |
echo "Some workflows have failed!"
exit 1
- name: Signal success
if: ${{ !cancelled() && !contains(needs.*.result, 'cancelled') && !contains(needs.*.result, 'failure') }}
run: echo "All done!"
30 changes: 19 additions & 11 deletions src/neo4j/_codec/hydration/v1/temporal.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,17 +216,18 @@ def dehydrate_np_datetime(value):
"""
if np.isnat(value):
return None
year = value.astype("datetime64[Y]").astype(int) + 1970
year = value.astype("datetime64[Y]").astype(np.int64) + 1970
if not 0 < year <= 9999:
# while we could encode years outside the range, they would fail
# when retrieved from the database.
raise ValueError(
f"Year out of range ({MIN_YEAR:d}..{MAX_YEAR:d}) "
f"found {year}"
)
seconds = value.astype(np.dtype("datetime64[s]")).astype(int)
seconds = value.astype(np.dtype("datetime64[s]")).astype(np.int64)
nanoseconds = (
value.astype(np.dtype("datetime64[ns]")).astype(int) % NANO_SECONDS
value.astype(np.dtype("datetime64[ns]")).astype(np.int64)
% NANO_SECONDS
)
return Structure(b"d", seconds, nanoseconds)

Expand Down Expand Up @@ -299,6 +300,7 @@ def dehydrate_timedelta(value):


if np is not None:
_NUMPY_DURATION_NS_FALLBACK = object()
_NUMPY_DURATION_UNITS = {
"Y": "years",
"M": "months",
Expand All @@ -310,6 +312,9 @@ def dehydrate_timedelta(value):
"ms": "milliseconds",
"us": "microseconds",
"ns": "nanoseconds",
"ps": _NUMPY_DURATION_NS_FALLBACK,
"fs": _NUMPY_DURATION_NS_FALLBACK,
"as": _NUMPY_DURATION_NS_FALLBACK,
}

def dehydrate_np_timedelta(value):
Expand All @@ -323,14 +328,17 @@ def dehydrate_np_timedelta(value):
if np.isnat(value):
return None
unit, step_size = np.datetime_data(value)
numer = int(value.astype(int))
# raise RuntimeError((type(numer), type(step_size)))
kwarg = _NUMPY_DURATION_UNITS.get(unit)
if kwarg is not None:
return dehydrate_duration(Duration(**{kwarg: numer * step_size}))
return dehydrate_duration(
Duration(nanoseconds=value.astype("timedelta64[ns]").astype(int))
)
numer = int(value.astype(np.int64))
try:
kwarg = _NUMPY_DURATION_UNITS[unit]
except KeyError:
raise TypeError(
f"Unsupported numpy.timedelta64 unit: {unit!r}"
) from None
if kwarg is _NUMPY_DURATION_NS_FALLBACK:
nanoseconds = value.astype("timedelta64[ns]").astype(np.int64)
return dehydrate_duration(Duration(nanoseconds=nanoseconds))
return dehydrate_duration(Duration(**{kwarg: numer * step_size}))


if pd is not None:
Expand Down
8 changes: 8 additions & 0 deletions tests/unit/async_/io/test_neo4j_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@


import inspect
import time

import pytest

Expand All @@ -28,6 +29,7 @@
AsyncBolt,
AsyncNeo4jPool,
)
from neo4j._async_compat import async_sleep
from neo4j._async_compat.util import AsyncUtil
from neo4j._conf import (
RoutingConfig,
Expand All @@ -45,6 +47,8 @@
from ...._async_compat import mark_async_test


MONOTONIC_TIME_RESOLUTION = time.get_clock_info("monotonic").resolution

ROUTER1_ADDRESS = ResolvedAddress(("1.2.3.1", 9000), host_name="host")
ROUTER2_ADDRESS = ResolvedAddress(("1.2.3.1", 9001), host_name="host")
ROUTER3_ADDRESS = ResolvedAddress(("1.2.3.1", 9002), host_name="host")
Expand Down Expand Up @@ -193,6 +197,8 @@ async def test_acquires_new_routing_table_if_stale(
old_value = pool.routing_tables[db.name].last_updated_time
pool.routing_tables[db.name].ttl = 0

await async_sleep(MONOTONIC_TIME_RESOLUTION * 2)

cx = await pool.acquire(READ_ACCESS, 30, db, None, None, None)
await pool.release(cx)
assert pool.routing_tables[db.name].last_updated_time > old_value
Expand All @@ -214,6 +220,8 @@ async def test_removes_old_routing_table(opener):
db2_rt = pool.routing_tables[TEST_DB2.name]
db2_rt.ttl = -RoutingConfig.routing_table_purge_delay

await async_sleep(MONOTONIC_TIME_RESOLUTION * 2)

cx = await pool.acquire(READ_ACCESS, 30, TEST_DB1, None, None, None)
await pool.release(cx)
assert pool.routing_tables[TEST_DB1.name].last_updated_time > old_value
Expand Down
19 changes: 19 additions & 0 deletions tests/unit/async_/test_addressing.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,12 @@ async def test_address_resolve_with_custom_resolver_none() -> None:
@pytest.mark.parametrize(
("test_input", "expected"),
[
(Address(("example.invalid", "7687")), ValueError),
(Address(("example.invalid", 7687)), ValueError),
(Address(("example.invalid", None)), ValueError),
(Address(("127.0.0.1", "abcd")), ValueError),
(Address((None, None)), ValueError),
(Address((1234, "7687")), TypeError),
],
)
@mark_async_test
Expand All @@ -67,6 +71,21 @@ async def test_address_resolve_with_unresolvable_address(
)


@pytest.mark.parametrize(
"test_input",
[
Address((None, 7687)),
Address(("example.com", None)),
],
)
@mark_async_test
async def test_address_resolves_with_none(test_input) -> None:
resolved = await AsyncUtil.list(
AsyncNetworkUtil.resolve_address(test_input, resolver=None)
)
assert resolved


@mark_async_test
@pytest.mark.parametrize("resolver_type", ("sync", "async"))
async def test_address_resolve_with_custom_resolver(resolver_type) -> None:
Expand Down
22 changes: 20 additions & 2 deletions tests/unit/common/codec/packstream/v1/test_packstream.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@


import struct
import sys
from io import BytesIO
from math import (
isnan,
Expand All @@ -37,6 +38,11 @@

standard_ascii = [chr(i) for i in range(128)]
not_ascii = "♥O◘♦♥O◘♦"
SKIP_PANDAS_INT_AS_INT64 = (
pd.Series([], dtype=int).dtype.itemsize < 8
and sys.version_info < (3, 9)
and sys.platform == "win32"
)


@pytest.fixture
Expand Down Expand Up @@ -289,7 +295,13 @@ def test_positive_int64(self, int_type, assert_packable):
@pytest.mark.parametrize(
"dtype",
(
int,
pytest.param(
int,
marks=pytest.mark.skipif(
SKIP_PANDAS_INT_AS_INT64,
reason="Legacy pandas treating int as int32",
),
),
pd.Int64Dtype(),
pd.UInt64Dtype(),
np.int64,
Expand Down Expand Up @@ -317,7 +329,13 @@ def test_negative_int64(self, int_type, assert_packable):
@pytest.mark.parametrize(
"dtype",
(
int,
pytest.param(
int,
marks=pytest.mark.skipif(
SKIP_PANDAS_INT_AS_INT64,
reason="Legacy pandas treating int as int32",
),
),
pd.Int64Dtype(),
np.int64,
np.longlong,
Expand Down
8 changes: 8 additions & 0 deletions tests/unit/sync/io/test_neo4j_pool.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions tests/unit/sync/test_addressing.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.