From b38332749110078f71275361ba1c34fb3634f294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C5=A0koda?= Date: Wed, 24 Jul 2024 14:43:32 +0200 Subject: [PATCH] pin numpy 1 --- requirements.txt | 5 ++++- setup.py | 2 +- tox.ini | 23 ++++++++++++----------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/requirements.txt b/requirements.txt index db2d868..f4b70df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,10 +8,13 @@ twine==4.0.1 # Click==7.1.2 pytest==7.1.3 # jinja2==3.1.2 +numba==0.58.1; python_version < '3.12' +numba==0.60.0; python_version >= '3.12' typing-extensions==4.4.0; python_version < '3.8' pandas==1.2.0; python_version < '3.8' -pandas==2.1.2; python_version >= '3.8' +pandas==2.0.3; python_version == '3.8' +pandas==2.1.4; python_version > '3.8' boto3==1.24.89 cachetools_ext==0.0.8 botocache==0.0.4 diff --git a/setup.py b/setup.py index adc8c16..34f0348 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ requirements = [ 'pandas>=1.0.5', 'boto3>=1.24,<2', 'cachetools_ext>=0.0.8,<0.1.0', 'botocache>=0.0.4,<0.1.0', - 'joblib>=1.0.0', 'tqdm>=4,<5', 'pyarrow>=2.0.0,<15', 'aws-requests-auth==0.4.3', + 'joblib>=1.0.0', 'tqdm>=4,<5', 'pyarrow>=2.0.0,<15', 'aws-requests-auth==0.4.3', 'numpy<2', 'typing-extensions>=4.0,<5; python_version < \'3.8\'' ] diff --git a/tox.ini b/tox.ini index 0e339f4..79595e7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,19 +1,20 @@ [tox] -envlist = py36, py37, py38, py39, py310, flake8 +envlist = py38, py311, py312 +;, flake8 -[testenv:flake8] -basepython = python -deps = flake8 -commands = flake8 lakeapi tests +; [testenv:flake8] +; basepython = python +; deps = flake8 +; commands = flake8 lakeapi tests [testenv] +usedevelop = True setenv = PYTHONPATH = {toxinidir} -deps = - -r{toxinidir}/requirements_dev.txt -; If you want to make tox run the tests with the same versions, create a -; requirements.txt with the pinned versions and uncomment the following line: +; deps = ; -r{toxinidir}/requirements.txt +deps = + pytest commands = - pytest --basetemp={envtmpdir} - + pytest --basetemp={envtmpdir} --ignore=tests/test_orderbook.py +; test_orderbook.py requires numba and is not included in package