Merge pull request #32 from adaa-polsl/develop

Clear project requirements and loosen their version restrictions

Author: cezary986

docs/requirements.txt

@@ -9,4 +9,6 @@ ipython_genutils~=0.2.0
 flake8
 junitxml==0.7
 junit2html~=31.0.2
-genbadge[all]~=1.1.1
+genbadge[all]~=1.1.1
+../ 
+

setup.py

@@ -10,7 +10,7 @@
 
 setuptools.setup(
     name="rulekit",
-    version='2.1.18.0',
+    version='2.1.21.0',
     author="Cezary Maszczyk",
     author_email="[email protected]",
     description="Comprehensive suite for rule-based learning",
@@ -33,10 +33,12 @@
     include_package_data=True,
     python_requires='>=3.9',
     install_requires=[
-        "pandas >= 1.5.0, < 2.3.0",
-        "scikit-learn >= 1.1.0, < 1.4.0",
-        "JPype1 >= 1.5.0, < 1.6.0",
-        "pydantic >= 2.0.0, < 2.6.0"
+        'numpy>=1.24',
+        'pandas>=1.5',
+        'scipy>=1.11',
+        'scikit-learn>=1.1',
+        'JPype1>=1.5.0',
+        'pydantic>=2.0',
     ],
     test_suite="tests",
     project_urls={

tests/test_regression.py

@@ -17,23 +17,6 @@
 from tests.utils import get_test_cases
 
 
-def print_rulekit_rules_from_jar_result(file):
-    lines = file.readlines()
-    tmp = []
-    start = False
-    for line in lines:
-        if start:
-            tmp.append(line)
-        if line.strip() == 'Rules:':
-            start = True
-        if line.strip() == 'Attribute ranking (by count):':
-            break
-
-    print('\nRuleKit jar rules:')
-    for rule in tmp:
-        print(rule.strip())
-
-
 class TestRegressor(unittest.TestCase):
 
     @classmethod

tests/test_survival.py

@@ -84,7 +84,6 @@ def test_fit_and_predict_on_boolean_columns(self):
         y = pd.Series(y)
         clf.fit(X, y)
         p = clf.predict(X)
-        print(p)
 
 
 class TestExpertSurvivalLogRankTree(unittest.TestCase):