From 52c8bd4b182b3394d6c4e61981d0c22b9c3d4c90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C5=A0koda?= <jan.skoda@quantlane.com>
Date: Wed, 24 Jul 2024 15:04:39 +0200
Subject: [PATCH] update history, fix gitlab action

---
 .github/workflows/dev.yml | 2 +-
 HISTORY.rst               | 8 ++++++++
 requirements.txt          | 6 ++++--
 tox.ini                   | 8 ++++----
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 1b77758..d34b0be 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -36,7 +36,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip wheel
+          python -m pip install --upgrade pip wheel setuptools
           pip install -r requirements.txt
 
       - name: Lint with flake8
diff --git a/HISTORY.rst b/HISTORY.rst
index 06ff9b8..76e8ba4 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -2,6 +2,14 @@
 History
 =======
 
+0.15.0 (2024-07-24)
+-------------------
+
+* fix conflict of new numpy 2 and older pyarrow
+* dont use deprecated joblib.Memory features
+* improve tox tests
+* add missing numba dependency needed by orderbook class (the rest works without numba)
+
 0.14.0 (2023-05-02)
 -------------------
 
diff --git a/requirements.txt b/requirements.txt
index f4b70df..2a0f364 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,8 +8,8 @@ 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'
+numba; python_version < '3.12'
+numba==0.60.; python_version >= '3.12'
 
 typing-extensions==4.4.0; python_version < '3.8'
 pandas==1.2.0; python_version < '3.8'
@@ -25,3 +25,5 @@ tqdm==4.64.1
 pyarrow==12.0.0; python_version < '3.12'
 pyarrow==14.0.0; python_version >= '3.12'
 aws-requests-auth==0.4.3
+setuptools
+distutils
diff --git a/tox.ini b/tox.ini
index e5f6164..442d576 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,11 +11,11 @@ envlist = py38, py311, py312
 usedevelop = True
 setenv =
     PYTHONPATH = {toxinidir}
-; deps =
-;     -r{toxinidir}/requirements.txt
 deps =
-    setuptools
-    pytest
+    -r{toxinidir}/requirements.txt
+; deps =
+;     setuptools
+;     pytest
 commands =
     pytest --basetemp={envtmpdir} --ignore=tests/test_orderbook.py
     ; pip list