Bump minimum Python version to 3.8 (#1876)

* Bump minimum Python version to 3.8

* typing_extensions.Literal -> typing.Literal

* ns-dev-test

* typing_extensions.get_args => typing.get_args

* Format with older version of black

* Bump `black`

* Run black
This commit is contained in:
Brent Yi authored and GitHub committed 2023-05-06 13:29:48 -07:00
1 parent 7537551f38
commit 63c6303736
58 files changed
+70 -117

No files matched your search

+6 -7
View File
@@ -141,7 +141,6 @@ class CreateJSONCameraPath(bpy.types.Operator):
keyframe_list = []
for i, transformed_camera_path_mat_val in enumerate(self.transformed_camera_path_mat):
curr_properties = (
'[["FOV",'
+ str(self.fov_list[i])
@@ -361,7 +360,7 @@ class NerfstudioBgPanel(bpy.types.Panel): # pylint: disable=too-few-public-meth
self.layout.label(text="Camera path for Nerfstudio")
col = self.layout.column()
for (prop_name, _) in INPUT_PROPERTIES:
for prop_name, _ in INPUT_PROPERTIES:
row = col.row()
row.prop(context.scene, prop_name)
@@ -385,7 +384,7 @@ class NerfstudioInputPanel(bpy.types.Panel): # pylint: disable=too-few-public-m
self.layout.label(text="Create Blender Camera From Nerfstudio JSON")
col = self.layout.column()
for (prop_name, _) in INPUT_PROPERTIES_NS_CAMERA:
for prop_name, _ in INPUT_PROPERTIES_NS_CAMERA:
row = col.row()
row.prop(context.scene, prop_name)
@@ -425,10 +424,10 @@ OBJ_PROPERTIES = ["NeRF", "RenderCamera"]
def register():
"""Register classes for UI panel."""
for (prop_name, prop_value) in INPUT_PROPERTIES:
for prop_name, prop_value in INPUT_PROPERTIES:
setattr(bpy.types.Scene, prop_name, prop_value)
for (prop_name, prop_value) in INPUT_PROPERTIES_NS_CAMERA:
for prop_name, prop_value in INPUT_PROPERTIES_NS_CAMERA:
setattr(bpy.types.Scene, prop_name, prop_value)
bpy.types.Scene.NeRF = bpy.props.PointerProperty(type=bpy.types.Object)
@@ -440,10 +439,10 @@ def register():
def unregister():
"""Unregister classes for UI panel."""
for (prop_name, _) in INPUT_PROPERTIES:
for prop_name, _ in INPUT_PROPERTIES:
delattr(bpy.types.Scene, prop_name)
for (prop_name, _) in INPUT_PROPERTIES_NS_CAMERA:
for prop_name, _ in INPUT_PROPERTIES_NS_CAMERA:
delattr(bpy.types.Scene, prop_name)
del bpy.types.Scene.NeRF
+3 -3
View File
@@ -10,13 +10,13 @@ import shutil
import stat
import subprocess
import sys
from typing import List, Optional, Union
from typing import List, Literal, Optional, Union
from typing import get_args as typing_get_args
import tyro
from rich.console import Console
from rich.prompt import Confirm
from typing_extensions import Literal, assert_never
from typing_extensions import get_args as typing_get_args
from typing_extensions import assert_never
if sys.version_info < (3, 10):
import importlib_metadata
+1 -2
View File
@@ -1,7 +1,7 @@
import os
from dataclasses import dataclass
from pathlib import Path
from typing import Tuple
from typing import Literal, Tuple
import cv2
import numpy as np
@@ -10,7 +10,6 @@ from nuscenes.nuscenes import NuScenes as NuScenesDatabase
from nuscenes.utils.data_classes import Box
from nuscenes.utils.geometry_utils import BoxVisibility, view_points
from tqdm import tqdm
from typing_extensions import Literal
@dataclass
+2 -2
View File
@@ -11,7 +11,7 @@ import sys
from contextlib import ExitStack
from dataclasses import dataclass, field
from pathlib import Path
from typing import Any, Dict, List, Optional
from typing import Any, Dict, List, Literal, Optional
import mediapy as media
import numpy as np
@@ -29,7 +29,7 @@ from rich.progress import (
)
from rich.table import Table
from torchtyping import TensorType
from typing_extensions import Literal, assert_never
from typing_extensions import assert_never
from nerfstudio.cameras.camera_paths import (
get_interpolated_camera_path,
+1 -2
View File
@@ -6,11 +6,10 @@ from __future__ import annotations
from dataclasses import dataclass
from pathlib import Path
from typing import Optional
from typing import Literal, Optional
import tyro
from rich.console import Console
from typing_extensions import Literal
from nerfstudio.exporter import texture_utils
from nerfstudio.exporter.exporter_utils import get_mesh_from_filename