From 36dbe222180ed1f69008da952ea03964df917c8d Mon Sep 17 00:00:00 2001
From: devrimcavusoglu <devrimcavusoglu@gmail.com>
Date: Sun, 8 Oct 2023 14:39:02 +0300
Subject: [PATCH] Drop py3.7 support, change CI.

---
 .github/workflows/ci.yml |  2 +-
 jury/__init__.py         |  2 +-
 setup.py                 | 16 +++++++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 86e3e3d..69b43a2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.8, 3.9, '3.10', '3.11']
       fail-fast: false
 
     steps:
diff --git a/jury/__init__.py b/jury/__init__.py
index 5c9c628..6346b54 100644
--- a/jury/__init__.py
+++ b/jury/__init__.py
@@ -1,4 +1,4 @@
 from jury.core import Jury
 from jury.metrics import AutoMetric, list_metrics, load_metric
 
-__version__ = "2.2.4"
+__version__ = "2.3-rc.1"
diff --git a/setup.py b/setup.py
index fb097eb..e5a8366 100644
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,6 @@ def add_pywin(reqs: List[str]) -> None:
     "black==21.7b0",
     "deepdiff==5.5.0",
     "flake8==3.9.2",
-    'importlib-metadata>=1.1.0,<4.3;python_version<"3.8"',
     "isort==5.9.2",
     "pytest>=7.0.1",
     "pytest-cov>=3.0.0",
@@ -47,8 +46,7 @@ def add_pywin(reqs: List[str]) -> None:
 
 _PRISM_REQUIREMENTS = [
     "fairseq==0.9.0",
-    'numpy>=1.23,<1.24;python_version>="3.8"',
-    'numpy==1.21.6;python_version<"3.8"',
+    'numpy',
 ]
 
 _METRIC_REQUIREMENTS = [
@@ -56,14 +54,13 @@ def add_pywin(reqs: List[str]) -> None:
     "bert_score==0.3.11",
     "jiwer>=2.3.0",
     "seqeval==1.2.2",
-    "sentencepiece==0.1.96",
-    'unbabel-comet>=1.1.2,<2;python_version<"3.8"',
-    'unbabel-comet>=2.0,<2.1;python_version>="3.8"',
+    "sentencepiece>=0.1.99,<0.2",
+    'unbabel-comet==2.0.1',
     "protobuf<3.20.1",
 ]
 
 _METRIC_REQUIREMENTS.extend(_PRISM_REQUIREMENTS)
-add_pywin(_METRIC_REQUIREMENTS)
+# add_pywin(_METRIC_REQUIREMENTS)
 
 extras = {
     "prism": _PRISM_REQUIREMENTS,
@@ -82,7 +79,7 @@ def add_pywin(reqs: List[str]) -> None:
     long_description_content_type="text/markdown",
     url="https://github.com/obss/jury",
     packages=setuptools.find_packages(exclude=["tests"]),
-    python_requires=">=3.7",
+    python_requires=">=3.8",
     install_requires=get_requirements(),
     extras_require=extras,
     include_package_data=True,
@@ -97,9 +94,10 @@ def add_pywin(reqs: List[str]) -> None:
         "Intended Audience :: Developers",
         "Intended Audience :: Science/Research",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Software Development :: Libraries",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Topic :: Education",