chore: bump commons and stubs version (#653)

jina-ai · Jan 16, 2023 · aa81a67 · aa81a67
1 parent 23aebe3
commit aa81a67
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.7
+      - name: Set up Python 3.8
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Install requirements
         run: make init
       - name: Lint with flake8, black and isort
@@ -27,10 +27,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.7
+      - name: Set up Python 3.8
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Install requirements
         run: make init
       - name: Run tests

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Remove `notebook_login` function. ([#631](https://github.com/jina-ai/finetuner/pull/631))
 
+- Remove support for python 3.7 ([#653](https://github.com/jina-ai/finetuner/pull/653))
+
 ### Changed
 
 - Adjust Finetuner based on API changes for Jina AI Cloud. ([#637](https://github.com/jina-ai/finetuner/pull/637))

diff --git a/Makefile b/Makefile
@@ -43,7 +43,7 @@ clean:
 
 ## Create a virtual environment
 env:
-	python3.7 -m venv .venv
+	python3.8 -m venv .venv
 	source .venv/bin/activate
 	pip install -U pip
 

diff --git a/README.md b/README.md
@@ -143,7 +143,7 @@ without worrying about resource availability, complex integration, or infrastruc
 
 ## Install
 
-Make sure you have Python 3.7+ installed. Finetuner can be installed via `pip` by executing:
+Make sure you have Python 3.8+ installed. Finetuner can be installed via `pip` by executing:
 
 ```bash
 pip install -U finetuner

diff --git a/docs/get-started/installation.md b/docs/get-started/installation.md
@@ -3,7 +3,7 @@
 
 ![PyPI](https://img.shields.io/pypi/v/finetuner?color=%23ffffff&label=%20) is the latest version.
 
-Make sure you have `Python 3.7+` installed on Linux/Mac/Windows:
+Make sure you have `Python 3.8+` installed on Linux/Mac/Windows:
 
 ```bash
 pip install -U finetuner

diff --git a/finetuner/constants.py b/finetuner/constants.py
@@ -30,6 +30,7 @@
 DATA = 'data'
 TRAIN_DATA = 'train_data'
 EVAL_DATA = 'eval_data'
+VAL_SPLIT = 'val_split'
 ARTIFACTS_DIR = 'artifacts/'
 MODEL = 'model'
 MODEL_OPTIONS = 'model_options'
@@ -50,6 +51,7 @@
 TEXT_MODALITY = 'text_modality'
 HYPER_PARAMETERS = 'hyper_parameters'
 LOSS = 'loss'
+LOSS_OPTIONS = 'loss_options'
 OPTIMIZER = 'optimizer'
 MINER = 'miner'
 MINER_OPTIONS = 'miner_options'

diff --git a/setup.py b/setup.py
@@ -29,12 +29,12 @@
         install_requires=[
             'docarray[common]>=0.20.1',
             'trimesh==3.16.4',
-            'finetuner-stubs==0.11.5',
+            'finetuner-stubs==0.12.2',
             'jina-hubble-sdk==0.24.0',
         ],
         extras_require={
             'full': [
-                'finetuner-commons==0.11.5',
+                'finetuner-commons==0.12.2',
             ],
             'test': [
                 'black==22.3.0',
@@ -45,13 +45,12 @@
                 'pytest-mock==3.7.0',
             ],
         },
-        python_requires='>=3.7.0',
+        python_requires='>=3.8.0',
         classifiers=[
             'Development Status :: 5 - Production/Stable',
             'Intended Audience :: Developers',
             'Intended Audience :: Education',
             'Intended Audience :: Science/Research',
-            'Programming Language :: Python :: 3.7',
             'Programming Language :: Python :: 3.8',
             'Programming Language :: Python :: 3.9',
             'License :: OSI Approved :: Apache Software License',

diff --git a/tests/unit/test_experiment.py b/tests/unit/test_experiment.py
@@ -17,6 +17,7 @@
     HYPER_PARAMETERS,
     LEARNING_RATE,
     LOSS,
+    LOSS_OPTIONS,
     MINER,
     MINER_OPTIONS,
     MODEL,
@@ -34,6 +35,7 @@
     STARTED,
     STATUS,
     TRAIN_DATA,
+    VAL_SPLIT,
 )
 from finetuner.experiment import Experiment
 
@@ -105,9 +107,11 @@ def test_create_run_config():
             EVAL_DATA: 'eval_data',
             NUM_WORKERS: 8,
             NUM_ITEMS_PER_CLASS: 4,
+            VAL_SPLIT: 0.0,
         },
         HYPER_PARAMETERS: {
             LOSS: 'TripletMarginLoss',
+            LOSS_OPTIONS: {},
             OPTIMIZER: 'Adam',
             OPTIMIZER_OPTIONS: {'weight_decay': 0.01},
             MINER: 'TripletMarginMiner',