argoverse · benjaminrwilson · Jul 23, 2021 · Jul 23, 2021 · Jul 23, 2021 · Jul 23, 2021
diff --git a/argoverse/__init__.py b/argoverse/__init__.py
@@ -0,0 +1 @@
+VERSION = "1.1.0"
diff --git a/demo_usage/cuboids_to_bboxes.py b/demo_usage/cuboids_to_bboxes.py
@@ -348,7 +348,7 @@ def main(args: Any):
     logger.info(args)
 
     if args.log_ids is None:
-        logger.error(f"Please provide a comma seperated list of log ids")
-        raise ValueError(f"Please provide a comma seperated list of log ids")
+        logger.error("Please provide a comma seperated list of log ids")
+        raise ValueError("Please provide a comma seperated list of log ids")
 
     main(args)
diff --git a/demo_usage/visualize_30hz_benchmark_data_on_map.py b/demo_usage/visualize_30hz_benchmark_data_on_map.py
@@ -247,7 +247,7 @@ def render_bev_labels_mpl(
             city_to_egovehicle_se3: Transformation from egovehicle frame to city frame
             avm: ArgoverseMap instance
         """
-        if axis is not "city_axis":
+        if axis != "city_axis":
             # rendering instead in the egovehicle reference frame
             for da_idx, local_da in enumerate(local_das):
                 local_da = city_to_egovehicle_se3.inverse_transform_point_cloud(local_da)
@@ -262,7 +262,7 @@ def render_bev_labels_mpl(
         draw_lane_polygons(ax, local_lane_polygons)
         draw_lane_polygons(ax, local_das, color="tab:pink")
 
-        if axis is not "city_axis":
+        if axis != "city_axis":
             lidar_pts = rotate_polygon_about_pt(lidar_pts, city_to_egovehicle_se3.rotation, np.zeros((3,)))
             draw_point_cloud_bev(ax, lidar_pts)
 
@@ -283,7 +283,7 @@ def render_bev_labels_mpl(
                     bbox_ego_frame = rotate_polygon_about_pt(
                         bbox_ego_frame, city_to_egovehicle_se3.rotation, np.zeros((3,))
                     )
-                    if axis is "city_axis":
+                    if axis == "city_axis":
                         plot_bbox_2D(ax, bbox_city_fr, color)
                         if self.plot_lane_tangent_arrows:
                             bbox_center = np.mean(bbox_city_fr, axis=0)

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,6 @@
+[tool.black]
+line-length = 120
+
 [tool.isort]
 known_first_party = "argoverse"
 known_third_party = "mayavi,pytest,colour,descartes,imageio,matplotlib,motmetrics,numpy,cv2,pandas,pillow,imageio,pyntcloud,scipy,shapely,sklearn"
@@ -6,5 +9,9 @@ line_length = 120
 multi_line_output = 3
 profile = "black"
 
-[tool.black]
-line-length = 120
+[tool.mypy]
+ignore_missing_imports = true
+strict = true
+
+[tool.pytest.ini_options]
+addopts = "--cov argoverse --cov-append --cov-branch --cov-report=term-missing"
diff --git a/setup.cfg b/setup.cfg
@@ -1,2 +1,60 @@
 [metadata]
+author = Argo AI
+author_email = [email protected]
+classifiers = 
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    License :: OSI Approved :: MIT License
+    Operating System :: POSIX
+    Operating System :: MacOS
+    Programming Language :: Python :: 3
+    Topic :: Scientific/Engineering :: Artificial Intelligence
 description_file = README.md
+keywords =
+    self-driving-car
+    dataset-tools
+license = MIT
+name = argoverse
+url = https://www.argoverse.org
+version = attr: argoverse.VERSION
+
+[options]
+zip_safe = False
+include_package_data = True
+packages = find:
+install_requires =
+    colour
+    descartes
+    imageio
+    h5py
+    hydra-core ==1.1.0
+    lap
+    matplotlib
+    motmetrics ==1.1.3
+    numba
+    numpy ==1.19
+    omegaconf ==2.1.0
+    opencv-python >=4.1.0.25
+    pandas >=0.23.1
+    pillow
+    imageio
+    pyntcloud >=0.1.0
+    scipy >=1.4.0
+    shapely
+    sklearn
+    tqdm
+    typing_extensions
+
+[options.package_data]
+argoverse = argoverse/visualization/data/**/*
+
+[options.packages.find]
+exclude =
+    integration_tests
+    map_files
+    tests
+
+[flake8]
+enable_extensions = G
+ignore = E203,E704,E711,E722,E741,W291,W293,W391,W503,F821,F401,F811,F841,P101,G004,G002,I201,I100,I101
+max_line_length = 120
diff --git a/setup.py b/setup.py
@@ -7,68 +7,12 @@
 """
 
 import platform
-import sys
-from codecs import open  # To use a consistent encoding
-from os import path
 
 # Always prefer setuptools over distutils
 from setuptools import find_packages, setup
 
-here = path.abspath(path.dirname(__file__))
-
-# Get the long description from the README file
-with open(path.join(here, "README.md"), encoding="utf-8") as f:
-    long_description = f.read()
-
-
 if platform.system() == "Windows":
     print("Argoverse currently does not support Windows, please use Linux/Mac OS")
-    sys.exit(1)
+    exit(1)
 
-setup(
-    name="argoverse",
-    version="1.0.1",
-    description="",
-    long_description=long_description,
-    url="https://www.argoverse.org",
-    author="Argo AI",
-    author_email="[email protected]",
-    license="MIT",
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: POSIX",
-        "Operating System :: MacOS",
-        "Programming Language :: Python :: 3",
-        "Topic :: Scientific/Engineering :: Artificial Intelligence",
-    ],
-    keywords="self-driving-car dataset-tools",
-    packages=find_packages(exclude=["tests", "integration_tests", "map_files"]),
-    package_data={"argoverse": ["argoverse/visualization/data/**/*"]},
-    include_package_data=True,
-    python_requires=">= 3.7",
-    install_requires=[
-        "colour",
-        "descartes",
-        "imageio",
-        "h5py",
-        "hydra-core==1.1.0",
-        "lap",
-        "matplotlib",
-        "motmetrics==1.1.3",
-        "numba",
-        "numpy==1.19",
-        "omegaconf==2.1.0",
-        "opencv-python>=4.1.0.25",
-        "pandas>=0.23.1",
-        "pillow",
-        "imageio",
-        "pyntcloud>=0.1.0",
-        "scipy>=1.4.0",
-        "shapely",
-        "sklearn",
-        "tqdm",
-        "typing_extensions",
-    ],
-)
+setup()
diff --git a/tox.ini b/tox.ini
@@ -12,9 +12,9 @@ deps =
     flake8-string-format
 
 commands =
-   pytest tests --cov argoverse --cov-append --cov-branch --cov-report=term-missing
-   flake8 --max-line-length 120 --ignore E203,E704,E711,E722,E741,W291,W293,W391,W503,F821,F401,F811,F841,P101,G004,G002,I201,I100,I101 --enable-extensions G argoverse
-   mypy --ignore-missing --strict argoverse
+   pytest tests
+   flake8 argoverse
+   mypy argoverse
 
 depends =
   py3{7,8}: clean
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		VERSION = "1.1.0"
Copy link Contributor Author benjaminrwilson Jul 25, 2021 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Used in `setup.cfg`. Copy link Contributor johnwlambert Jul 28, 2021 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. is the version required to be placed here? This probably wouldnt be a place I would look for the version number, so do we need to write it in 2 places now? Copy link Contributor Author benjaminrwilson Jul 28, 2021 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. This is the first method listed here: https://packaging.python.org/guides/single-sourcing-package-version/#single-sourcing-the-package-version. Although, they use `__version__` instead of `VERSION`. Copy link Contributor Author benjaminrwilson Jul 28, 2021 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Updated to use `__version__`.