Skip to content

Replace deprecated distutils and pkg_resources with modern alternatives #1160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhruvildarji wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace deprecated distutils and pkg_resources with modern alternatives #1160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ six
simple-watchdog-timer
antlr4-python3-runtime==4.10
graphviz
packaging
18 changes: 4 additions & 14 deletions scenario_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@
import argparse
from argparse import RawTextHelpFormatter
from datetime import datetime
try:
from packaging.version import Version
except ImportError:
from distutils.version import LooseVersion as Version # Python 2 fallback
from packaging.version import Version
import importlib
import inspect
import os
Expand All @@ -32,18 +29,11 @@
import time
import json

try:
# requires Python 3.8+
from importlib.metadata import metadata
from importlib.metadata import metadata

def get_carla_version():
return Version(metadata("carla")["Version"])
except ModuleNotFoundError:
# backport checking for older Python versions; module is deprecated
import pkg_resources

def get_carla_version():
return Version(pkg_resources.get_distribution("carla").version)
def get_carla_version():
return Version(metadata("carla")["Version"])

import carla

Expand Down