From ace600e3270a1697169ac828ee4b40f10c302dc3 Mon Sep 17 00:00:00 2001 From: SpitfireX Date: Wed, 26 Jun 2024 17:21:39 +0200 Subject: [PATCH 1/2] changed dependencies and setup.py to account for the deprecation of distutils --- Pipfile | 4 ++-- setup.py | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Pipfile b/Pipfile index 64afb22..6ed8145 100644 --- a/Pipfile +++ b/Pipfile @@ -8,8 +8,8 @@ pytest = "==7.0.1" pylint = "==2.13.9" pytest-cov = "==3.0.0" twine = "==3.7.1" -setuptools = "==59.6.0" -cython = "==0.29.30" +setuptools = "==68.0.0" +cython = "==3.0.0" [packages] wheel = ">=0.37.1" diff --git a/setup.py b/setup.py index 0305884..13c48f4 100644 --- a/setup.py +++ b/setup.py @@ -2,9 +2,7 @@ import os import sys -from setuptools import find_packages, Command -from distutils.core import setup -from distutils.extension import Extension +from setuptools import find_packages, setup, Command, Extension # Package meta-data. NAME = 'association-measures' From 4c8452e8f2532e2f08019c56406d4729ed0a5feb Mon Sep 17 00:00:00 2001 From: SpitfireX Date: Wed, 26 Jun 2024 18:05:42 +0200 Subject: [PATCH 2/2] bumped all dependencies to match cwb-ccc --- Pipfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Pipfile b/Pipfile index 6ed8145..a60b660 100644 --- a/Pipfile +++ b/Pipfile @@ -4,14 +4,15 @@ url = "https://pypi.org/simple" verify_ssl = true [dev-packages] -pytest = "==7.0.1" -pylint = "==2.13.9" -pytest-cov = "==3.0.0" -twine = "==3.7.1" +pytest = "==7.4.0" +pylint = "==2.17.5" +pytest-cov = "==4.1.0" +twine = "==4.0.2" setuptools = "==68.0.0" cython = "==3.0.0" [packages] -wheel = ">=0.37.1" -pandas = ">=1.1.5" +wheel = ">=0.41.1,<0.42" +pandas = ">=1.3.5,<2.0" +numpy = "<2.0.0" scipy = ">=1.5.4"