From abbb69cd14e8615ab8dd91366abb8563efb50e2e Mon Sep 17 00:00:00 2001 From: Vincent Moens Date: Thu, 19 Dec 2024 10:30:18 +0000 Subject: [PATCH 1/3] Update [ghstack-poisoned] --- .github/scripts/install-deps-smoke-test.sh | 1 + .github/workflows/build-wheels-aarch64-linux.yml | 1 + .github/workflows/build-wheels-linux.yml | 1 + .github/workflows/build-wheels-m1.yml | 1 + 4 files changed, 4 insertions(+) create mode 100755 .github/scripts/install-deps-smoke-test.sh diff --git a/.github/scripts/install-deps-smoke-test.sh b/.github/scripts/install-deps-smoke-test.sh new file mode 100755 index 000000000..061e6e950 --- /dev/null +++ b/.github/scripts/install-deps-smoke-test.sh @@ -0,0 +1 @@ +python3 -m pip install packaging diff --git a/.github/workflows/build-wheels-aarch64-linux.yml b/.github/workflows/build-wheels-aarch64-linux.yml index 6bd4fd1ac..164e2df22 100644 --- a/.github/workflows/build-wheels-aarch64-linux.yml +++ b/.github/workflows/build-wheels-aarch64-linux.yml @@ -34,6 +34,7 @@ jobs: include: - repository: pytorch/tensordict smoke-test-script: test/smoke_test.py + env-script: .github/scripts/install-deps-smoke-test.sh package-name: tensordict name: pytorch/tensordict uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main diff --git a/.github/workflows/build-wheels-linux.yml b/.github/workflows/build-wheels-linux.yml index b6fb57098..09afd984d 100644 --- a/.github/workflows/build-wheels-linux.yml +++ b/.github/workflows/build-wheels-linux.yml @@ -33,6 +33,7 @@ jobs: include: - repository: pytorch/tensordict smoke-test-script: test/smoke_test.py + env-script: .github/scripts/install-deps-smoke-test.sh package-name: tensordict name: pytorch/tensordict uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main diff --git a/.github/workflows/build-wheels-m1.yml b/.github/workflows/build-wheels-m1.yml index 6609cb5ae..39cc8e19b 100644 --- a/.github/workflows/build-wheels-m1.yml +++ b/.github/workflows/build-wheels-m1.yml @@ -33,6 +33,7 @@ jobs: include: - repository: pytorch/tensordict smoke-test-script: test/smoke_test.py + env-script: .github/scripts/install-deps-smoke-test.sh package-name: tensordict name: pytorch/tensordict uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@main From 876ca55debee6c19dcf7ddad9b497c4d1ce858ff Mon Sep 17 00:00:00 2001 From: Vincent Moens Date: Thu, 19 Dec 2024 10:43:26 +0000 Subject: [PATCH 2/3] Update [ghstack-poisoned] --- .github/scripts/install-deps-smoke-test.sh | 1 - .github/scripts/version_script.sh | 2 ++ .github/workflows/build-wheels-aarch64-linux.yml | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100755 .github/scripts/install-deps-smoke-test.sh diff --git a/.github/scripts/install-deps-smoke-test.sh b/.github/scripts/install-deps-smoke-test.sh deleted file mode 100755 index 061e6e950..000000000 --- a/.github/scripts/install-deps-smoke-test.sh +++ /dev/null @@ -1 +0,0 @@ -python3 -m pip install packaging diff --git a/.github/scripts/version_script.sh b/.github/scripts/version_script.sh index cf49f554d..4030ef482 100644 --- a/.github/scripts/version_script.sh +++ b/.github/scripts/version_script.sh @@ -1,3 +1,5 @@ #!/bin/bash export TENSORDICT_BUILD_VERSION=0.6.2 + +python -m pip install packaging diff --git a/.github/workflows/build-wheels-aarch64-linux.yml b/.github/workflows/build-wheels-aarch64-linux.yml index 164e2df22..9c690fcda 100644 --- a/.github/workflows/build-wheels-aarch64-linux.yml +++ b/.github/workflows/build-wheels-aarch64-linux.yml @@ -33,8 +33,6 @@ jobs: matrix: include: - repository: pytorch/tensordict - smoke-test-script: test/smoke_test.py - env-script: .github/scripts/install-deps-smoke-test.sh package-name: tensordict name: pytorch/tensordict uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main From f9c99cbadd9c1011423fa047c54ea234ba6c38f0 Mon Sep 17 00:00:00 2001 From: Vincent Moens Date: Thu, 19 Dec 2024 10:52:11 +0000 Subject: [PATCH 3/3] Update [ghstack-poisoned] --- .github/scripts/version_script.sh | 2 -- setup.py | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/scripts/version_script.sh b/.github/scripts/version_script.sh index 4030ef482..cf49f554d 100644 --- a/.github/scripts/version_script.sh +++ b/.github/scripts/version_script.sh @@ -1,5 +1,3 @@ #!/bin/bash export TENSORDICT_BUILD_VERSION=0.6.2 - -python -m pip install packaging diff --git a/setup.py b/setup.py index 26f2a321f..1a84252b6 100644 --- a/setup.py +++ b/setup.py @@ -184,7 +184,13 @@ def _main(argv): "build_ext": BuildExtension.with_options(no_python_abi_suffix=True), "clean": clean, }, - install_requires=[pytorch_package_dep, "numpy", "cloudpickle", "orjson"], + install_requires=[ + pytorch_package_dep, + "numpy", + "cloudpickle", + "orjson", + "packaging", + ], extras_require={ "tests": [ "pytest",