From bae94138132ec18f622ee15ba4ad10f0a69cfe03 Mon Sep 17 00:00:00 2001 From: BBBmau Date: Wed, 22 May 2024 23:24:50 -0700 Subject: [PATCH 1/9] support Python 3.12 --- setup.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index da5e82984..47c8bf93e 100644 --- a/setup.py +++ b/setup.py @@ -26,8 +26,8 @@ def is_win(): return sys.platform == "win32" -assert sys.version_info.major == 3 and sys.version_info.minor >= 6 and sys.version_info.minor < 12, \ - "python version >= 3.6, <3.12 is required" +assert sys.version_info.major == 3 and sys.version_info.minor >= 6 and sys.version_info.minor < 13, \ + "python version >= 3.6, <3.13 is required" this_directory = path.abspath(path.dirname(__file__)) with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f: @@ -48,8 +48,7 @@ def is_win(): "seaborn", "tqdm", "progressbar", - # "panda3d==1.10.8", - "panda3d==1.10.13", + "panda3d==1.10.14", "panda3d-gltf==0.13", # 0.14 will bring some problems "pillow", "pytest", @@ -82,7 +81,7 @@ def is_win(): setup( name="metadrive-simulator", - python_requires='>=3.6, <3.12', # do version check with assert + python_requires='>=3.6, <3.13', # do version check with assert version=VERSION, description="An open-ended driving simulator with infinite scenes", url="https://github.com/metadriverse/metadrive", From df5295b30ec6ca75e9d6d7dfdd09c37569a5c502 Mon Sep 17 00:00:00 2001 From: BBBmau Date: Sat, 25 May 2024 21:59:58 -0700 Subject: [PATCH 2/9] initial release setup --- metadrive/version.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadrive/version.py b/metadrive/version.py index b7309cabd..d00e5df38 100644 --- a/metadrive/version.py +++ b/metadrive/version.py @@ -1,6 +1,6 @@ from pathlib import Path -VERSION = "0.4.2.3" +VERSION = "0.1.0" def asset_version(): diff --git a/setup.py b/setup.py index 47c8bf93e..4237bfc11 100644 --- a/setup.py +++ b/setup.py @@ -80,7 +80,7 @@ def is_win(): ] setup( - name="metadrive-simulator", + name="metadrive-simulator-py3.12", python_requires='>=3.6, <3.13', # do version check with assert version=VERSION, description="An open-ended driving simulator with infinite scenes", From b69c354356226aba4e26680bd7f39c5c16487774 Mon Sep 17 00:00:00 2001 From: BBBmau Date: Sun, 26 May 2024 15:43:28 -0700 Subject: [PATCH 3/9] release-0.2.0 --- metadrive/version.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadrive/version.py b/metadrive/version.py index d00e5df38..1cd4b2709 100644 --- a/metadrive/version.py +++ b/metadrive/version.py @@ -1,6 +1,6 @@ from pathlib import Path -VERSION = "0.1.0" +VERSION = "0.2.0" def asset_version(): diff --git a/setup.py b/setup.py index 4237bfc11..376cb3007 100644 --- a/setup.py +++ b/setup.py @@ -80,7 +80,7 @@ def is_win(): ] setup( - name="metadrive-simulator-py3.12", + name="metadrive-simulator-py3-12", python_requires='>=3.6, <3.13', # do version check with assert version=VERSION, description="An open-ended driving simulator with infinite scenes", From 6312eaef42b94ae270440c4a170acd4beebacda4 Mon Sep 17 00:00:00 2001 From: BBBmau Date: Sun, 26 May 2024 22:04:02 -0700 Subject: [PATCH 4/9] update asset_url --- metadrive/pull_asset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadrive/pull_asset.py b/metadrive/pull_asset.py index 59d1d2c4f..f09c8c3c0 100644 --- a/metadrive/pull_asset.py +++ b/metadrive/pull_asset.py @@ -15,7 +15,7 @@ from metadrive.version import asset_version ROOT_DIR = Path(__file__).parent -ASSET_URL = "https://github.com/metadriverse/metadrive/releases/download/MetaDrive-{}/assets.zip".format(VERSION) +ASSET_URL = "https://github.com/BBBmau/metadrive/releases/download/{}/assets.zip".format(VERSION) class MyProgressBar(): From f60d57a99d821c7fdfa1c25ae4f0ef86e96e19b5 Mon Sep 17 00:00:00 2001 From: BBBmau Date: Sun, 26 May 2024 22:14:47 -0700 Subject: [PATCH 5/9] release-0.3.0 --- metadrive/version.py | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/metadrive/version.py b/metadrive/version.py index b7309cabd..c859de4db 100644 --- a/metadrive/version.py +++ b/metadrive/version.py @@ -1,6 +1,6 @@ from pathlib import Path -VERSION = "0.4.2.3" +VERSION = "0.3.0" def asset_version(): diff --git a/setup.py b/setup.py index 47c8bf93e..378594352 100644 --- a/setup.py +++ b/setup.py @@ -80,11 +80,11 @@ def is_win(): ] setup( - name="metadrive-simulator", + name="metadrive-simulator-py-3-12", python_requires='>=3.6, <3.13', # do version check with assert version=VERSION, description="An open-ended driving simulator with infinite scenes", - url="https://github.com/metadriverse/metadrive", + url="https://github.com/BBBmau/metadrive", author="MetaDrive Team", author_email="quanyili0057@gmail.com, pzh@cs.ucla.edu", packages=packages, From ebcfb740066dce0bc654fdbab12d44dfdfe72635 Mon Sep 17 00:00:00 2001 From: BBBmau Date: Sun, 26 May 2024 22:23:13 -0700 Subject: [PATCH 6/9] type --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 378594352..600e70004 100644 --- a/setup.py +++ b/setup.py @@ -80,7 +80,7 @@ def is_win(): ] setup( - name="metadrive-simulator-py-3-12", + name="metadrive-simulator-py3-12", python_requires='>=3.6, <3.13', # do version check with assert version=VERSION, description="An open-ended driving simulator with infinite scenes", From 2b59c467a589945da17ade2832b43ef9fdfce4fb Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Mon, 10 Jun 2024 16:58:10 -0700 Subject: [PATCH 7/9] clean --- metadrive/pull_asset.py | 2 +- metadrive/version.py | 2 +- setup.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/metadrive/pull_asset.py b/metadrive/pull_asset.py index f09c8c3c0..59d1d2c4f 100644 --- a/metadrive/pull_asset.py +++ b/metadrive/pull_asset.py @@ -15,7 +15,7 @@ from metadrive.version import asset_version ROOT_DIR = Path(__file__).parent -ASSET_URL = "https://github.com/BBBmau/metadrive/releases/download/{}/assets.zip".format(VERSION) +ASSET_URL = "https://github.com/metadriverse/metadrive/releases/download/MetaDrive-{}/assets.zip".format(VERSION) class MyProgressBar(): diff --git a/metadrive/version.py b/metadrive/version.py index afb971cfb..f1d40cbe8 100644 --- a/metadrive/version.py +++ b/metadrive/version.py @@ -1,6 +1,6 @@ from pathlib import Path -VERSION = "0.3.0" +VERSION = "0.4.2.3" def asset_version(): root_dir = Path(__file__).parent diff --git a/setup.py b/setup.py index 600e70004..47c8bf93e 100644 --- a/setup.py +++ b/setup.py @@ -80,11 +80,11 @@ def is_win(): ] setup( - name="metadrive-simulator-py3-12", + name="metadrive-simulator", python_requires='>=3.6, <3.13', # do version check with assert version=VERSION, description="An open-ended driving simulator with infinite scenes", - url="https://github.com/BBBmau/metadrive", + url="https://github.com/metadriverse/metadrive", author="MetaDrive Team", author_email="quanyili0057@gmail.com, pzh@cs.ucla.edu", packages=packages, From bd85b90c89e600c5516f88f091ee8991632102b2 Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Mon, 10 Jun 2024 18:09:32 -0700 Subject: [PATCH 8/9] format --- metadrive/version.py | 1 + 1 file changed, 1 insertion(+) diff --git a/metadrive/version.py b/metadrive/version.py index f1d40cbe8..b7309cabd 100644 --- a/metadrive/version.py +++ b/metadrive/version.py @@ -2,6 +2,7 @@ VERSION = "0.4.2.3" + def asset_version(): root_dir = Path(__file__).parent asset_path = root_dir / "assets" From 0823c7491a1ab870bcd53d10a41e985a3ad1b968 Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Tue, 11 Jun 2024 10:56:57 -0700 Subject: [PATCH 9/9] version <4 --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 47c8bf93e..ffe615b36 100644 --- a/setup.py +++ b/setup.py @@ -26,8 +26,7 @@ def is_win(): return sys.platform == "win32" -assert sys.version_info.major == 3 and sys.version_info.minor >= 6 and sys.version_info.minor < 13, \ - "python version >= 3.6, <3.13 is required" +assert (3,6) <= sys.version_info < (4,), "python version >= 3.6, <4 is required" this_directory = path.abspath(path.dirname(__file__)) with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f: @@ -81,7 +80,7 @@ def is_win(): setup( name="metadrive-simulator", - python_requires='>=3.6, <3.13', # do version check with assert + python_requires='>=3.6, <4', # do version check with assert version=VERSION, description="An open-ended driving simulator with infinite scenes", url="https://github.com/metadriverse/metadrive",