From 8fdfda4bc7b9dab43cb6f52c316df8d7e7e2ff71 Mon Sep 17 00:00:00 2001 From: Robb Walters Date: Wed, 23 Apr 2025 17:36:26 -0700 Subject: [PATCH 1/7] fix: allow pip install when not the repo root --- pyproject.toml | 13 +++++++++++++ setup.py | 7 ++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b4d35b402..0cb950bf3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,16 @@ +[project] +name = "pufferlib" +version = "2.0.6" +dependencies = ["numpy", "Cython"] +requires-python = ">=3.9" + +[build-system] +requires = ["setuptools", "wheel", "Cython", "numpy"] +build-backend = "setuptools.build_meta" + +[tool.setuptools.packages.find] +where = ["pufferlib"] + [build-system] requires = ["setuptools", "wheel", "Cython", "numpy"] build-backend = "setuptools.build_meta" diff --git a/setup.py b/setup.py index 14357d053..21b5248dd 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -from setuptools import find_packages, find_namespace_packages, setup, Extension +from setuptools import find_packages, setup, Extension from Cython.Build import cythonize import numpy import os @@ -303,7 +303,8 @@ "PufferAI's library of RL tools and utilities", long_description_content_type="text/markdown", version=VERSION, - packages=find_namespace_packages() + find_packages(), + packages=packages=find_packages(where="pufferlib"), + package_dir={"": "pufferlib"}, package_data={ "pufferlib": [ f'{RAYLIB_LIB}/libraylib.a', @@ -336,7 +337,7 @@ "c_gae.pyx", "pufferlib/puffernet.pyx", "pufferlib/ocean/grid/c_grid.pyx", - *extensions, + *[f"pufferlib/{path}.pyx" for path in extension_paths], ], compiler_directives={ 'language_level': 3, From 00d60bae2c6063958dbfa7a41b8cbc9137e6d7c1 Mon Sep 17 00:00:00 2001 From: Robb Walters Date: Wed, 23 Apr 2025 17:37:53 -0700 Subject: [PATCH 2/7] fix: typo --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 21b5248dd..b9a60c191 100644 --- a/setup.py +++ b/setup.py @@ -303,7 +303,7 @@ "PufferAI's library of RL tools and utilities", long_description_content_type="text/markdown", version=VERSION, - packages=packages=find_packages(where="pufferlib"), + packages=find_packages(where="pufferlib"), package_dir={"": "pufferlib"}, package_data={ "pufferlib": [ From 0cad03fbd932b8bc560164314de124e16455eb08 Mon Sep 17 00:00:00 2001 From: Robb Walters Date: Wed, 23 Apr 2025 17:42:57 -0700 Subject: [PATCH 3/7] fix: remove duplicate entry --- pyproject.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0cb950bf3..ab92ddf27 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,10 +4,6 @@ version = "2.0.6" dependencies = ["numpy", "Cython"] requires-python = ">=3.9" -[build-system] -requires = ["setuptools", "wheel", "Cython", "numpy"] -build-backend = "setuptools.build_meta" - [tool.setuptools.packages.find] where = ["pufferlib"] From 16d989f72e239d785bfe3653e037ddce2d08bb7c Mon Sep 17 00:00:00 2001 From: Robb Walters Date: Wed, 23 Apr 2025 17:45:04 -0700 Subject: [PATCH 4/7] fix: add "dynamic" --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ab92ddf27..08a5eb18d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,10 +3,11 @@ name = "pufferlib" version = "2.0.6" dependencies = ["numpy", "Cython"] requires-python = ">=3.9" +dynamic = ["description", "license", "authors", "keywords"] [tool.setuptools.packages.find] where = ["pufferlib"] [build-system] requires = ["setuptools", "wheel", "Cython", "numpy"] -build-backend = "setuptools.build_meta" +build-backend = "setuptools.build_meta" \ No newline at end of file From 30fd23b620150750232629eb0757f63c553b7ec9 Mon Sep 17 00:00:00 2001 From: Robb Walters Date: Wed, 23 Apr 2025 17:47:44 -0700 Subject: [PATCH 5/7] fix: just use find_packages --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b9a60c191..bca8bbac9 100644 --- a/setup.py +++ b/setup.py @@ -303,8 +303,7 @@ "PufferAI's library of RL tools and utilities", long_description_content_type="text/markdown", version=VERSION, - packages=find_packages(where="pufferlib"), - package_dir={"": "pufferlib"}, + packages=find_packages(), package_data={ "pufferlib": [ f'{RAYLIB_LIB}/libraylib.a', From 54d4ae689101c097f1953ff7a17a5ff20e18e115 Mon Sep 17 00:00:00 2001 From: Robb Walters Date: Wed, 23 Apr 2025 18:05:06 -0700 Subject: [PATCH 6/7] fix: undo --- pyproject.toml | 10 ---------- setup.py | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 08a5eb18d..8ff3b8aa8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,13 +1,3 @@ -[project] -name = "pufferlib" -version = "2.0.6" -dependencies = ["numpy", "Cython"] -requires-python = ">=3.9" -dynamic = ["description", "license", "authors", "keywords"] - -[tool.setuptools.packages.find] -where = ["pufferlib"] - [build-system] requires = ["setuptools", "wheel", "Cython", "numpy"] build-backend = "setuptools.build_meta" \ No newline at end of file diff --git a/setup.py b/setup.py index bca8bbac9..9ad634e1b 100644 --- a/setup.py +++ b/setup.py @@ -336,7 +336,7 @@ "c_gae.pyx", "pufferlib/puffernet.pyx", "pufferlib/ocean/grid/c_grid.pyx", - *[f"pufferlib/{path}.pyx" for path in extension_paths], + *extensions, ], compiler_directives={ 'language_level': 3, From 4d228168797bbbdbb36d5a4951670169477ec85e Mon Sep 17 00:00:00 2001 From: Robb Walters Date: Wed, 23 Apr 2025 18:07:28 -0700 Subject: [PATCH 7/7] fix: lint --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8ff3b8aa8..b4d35b402 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [build-system] requires = ["setuptools", "wheel", "Cython", "numpy"] -build-backend = "setuptools.build_meta" \ No newline at end of file +build-backend = "setuptools.build_meta"