Merge branch 'develop' into liezl/split-trainer-cli-into-two

talmolab · Mar 1, 2023 · 21436fe · 21436fe
2 parents 2e11887 + c636d96
commit 21436fe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/environment.yml b/environment.yml
@@ -7,7 +7,7 @@ dependencies:
   - conda-forge::pyside2>=5.13.2,<=5.14.1
   - conda-forge::h5py=3.1.0
   - conda-forge::scipy>=1.4.1,<=1.7.3
-  - pillow=8.4.0
+  - conda-forge::pillow=8.4.0
   - shapely=1.7.1
   - conda-forge::pandas
   - ffmpeg
@@ -17,7 +17,7 @@ dependencies:
   # - sleap::tensorflow=2.7.0
   # - sleap::pyside2=5.14.1
   - qtpy>=2.0.1
-  - conda-forge::pip!=22.0.4
+  - conda-forge::pip
   - pip:
       - "--editable=."
       - "--requirement=./dev_requirements.txt"
diff --git a/environment_no_cuda.yml b/environment_no_cuda.yml
@@ -7,7 +7,7 @@ dependencies:
   - conda-forge::pyside2>=5.13.2,<=5.14.1
   - conda-forge::h5py=3.1.0
   - conda-forge::scipy>=1.4.1,<=1.7.3
-  - pillow=8.4.0
+  - conda-forge::pillow=8.4.0
   - shapely=1.7.1
   - conda-forge::pandas
   - ffmpeg
@@ -17,7 +17,7 @@ dependencies:
   # - sleap::tensorflow=2.7.0
   # - sleap::pyside2=5.14.1
   - qtpy>=2.0.1
-  - conda-forge::pip!=22.0.4
+  - conda-forge::pip  # !=22.0.4
   - pip:
       - "--editable=."
       - "--requirement=./dev_requirements.txt"
diff --git a/sleap/skeleton.py b/sleap/skeleton.py
@@ -125,12 +125,12 @@ def __init__(self, name: str = None):
     def __repr__(self) -> str:
         """Return full description of the skeleton."""
         return (
-            f"Skeleton(name='{self.name}', ",
-            f"description='{self.description}', ",
+            f"Skeleton(name='{self.name}', "
+            f"description='{self.description}', "
             f"nodes={self.node_names}, "
             f"edges={self.edge_names}, "
             f"symmetries={self.symmetry_names}"
-            ")",
+            ")"
         )
 
     def __str__(self) -> str: