python 3.9 Path().is_relative_to() removal

ultralytics · Sep 28, 2021 · 938b39b · 938b39b
1 parent e2bd565
commit 938b39b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/detect.py b/detect.py
@@ -19,7 +19,7 @@
 ROOT = FILE.parents[0]  # YOLOv5 root directory
 if str(ROOT) not in sys.path:
     sys.path.append(str(ROOT))  # add ROOT to PATH
-ROOT = ROOT.relative_to(Path.cwd()) if ROOT.is_relative_to(Path.cwd()) else ROOT  # relative
+ROOT = ROOT.relative_to(Path.cwd())  # relative
 
 from models.experimental import attempt_load
 from utils.datasets import LoadImages, LoadStreams

diff --git a/export.py b/export.py
@@ -34,7 +34,7 @@
 ROOT = FILE.parents[0]  # YOLOv5 root directory
 if str(ROOT) not in sys.path:
     sys.path.append(str(ROOT))  # add ROOT to PATH
-ROOT = ROOT.relative_to(Path.cwd()) if ROOT.is_relative_to(Path.cwd()) else ROOT  # relative
+ROOT = ROOT.relative_to(Path.cwd())  # relative
 
 from models.common import Conv
 from models.experimental import attempt_load

diff --git a/models/tf.py b/models/tf.py
@@ -20,7 +20,7 @@
 ROOT = FILE.parents[1]  # YOLOv5 root directory
 if str(ROOT) not in sys.path:
     sys.path.append(str(ROOT))  # add ROOT to PATH
-ROOT = ROOT.relative_to(Path.cwd()) if ROOT.is_relative_to(Path.cwd()) else ROOT  # relative
+ROOT = ROOT.relative_to(Path.cwd())  # relative
 
 import numpy as np
 import tensorflow as tf

diff --git a/models/yolo.py b/models/yolo.py
@@ -15,7 +15,7 @@
 ROOT = FILE.parents[1]  # YOLOv5 root directory
 if str(ROOT) not in sys.path:
     sys.path.append(str(ROOT))  # add ROOT to PATH
-ROOT = ROOT.relative_to(Path.cwd()) if ROOT.is_relative_to(Path.cwd()) else ROOT  # relative
+ROOT = ROOT.relative_to(Path.cwd())  # relative
 
 from models.common import *
 from models.experimental import *

diff --git a/train.py b/train.py
@@ -30,7 +30,7 @@
 ROOT = FILE.parents[0]  # YOLOv5 root directory
 if str(ROOT) not in sys.path:
     sys.path.append(str(ROOT))  # add ROOT to PATH
-ROOT = ROOT.relative_to(Path.cwd()) if ROOT.is_relative_to(Path.cwd()) else ROOT  # relative
+ROOT = ROOT.relative_to(Path.cwd())  # relative
 
 import val  # for end-of-epoch mAP
 from models.experimental import attempt_load

diff --git a/val.py b/val.py
@@ -21,7 +21,7 @@
 ROOT = FILE.parents[0]  # YOLOv5 root directory
 if str(ROOT) not in sys.path:
     sys.path.append(str(ROOT))  # add ROOT to PATH
-ROOT = ROOT.relative_to(Path.cwd()) if ROOT.is_relative_to(Path.cwd()) else ROOT  # relative
+ROOT = ROOT.relative_to(Path.cwd())  # relative
 
 from models.experimental import attempt_load
 from utils.datasets import create_dataloader