diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index f09740f..f030055 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -39,7 +39,7 @@ jobs: scriptSource: inline script: | import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" urllib.request.urlretrieve(url, path) diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 851ab3e..70ad3f2 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -1,9 +1,9 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -30,4 +30,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index 03cac73..e168441 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -1,9 +1,9 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -30,4 +30,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index 2edae76..8b3b9fc 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -1,9 +1,9 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -30,4 +30,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index 0ec105f..e8b6583 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -1,9 +1,9 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -30,4 +30,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_python3.9.____73_pypy.yaml b/.ci_support/linux_64_python3.9.____73_pypy.yaml index f593bee..46cd2a2 100644 --- a/.ci_support/linux_64_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_python3.9.____73_pypy.yaml @@ -1,9 +1,9 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -30,4 +30,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 409494a..47f6b84 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -1,9 +1,9 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -30,4 +30,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index a7e6862..38998f6 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -34,4 +34,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index ec8a568..b911a10 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -34,4 +34,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml index 9be2f86..86be5a1 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -34,4 +34,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index ce15f48..21349b1 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -34,4 +34,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml index 9d4dbcd..16c4a3e 100644 --- a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml @@ -34,4 +34,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index 94c83fc..379274a 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -34,4 +34,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index df263b4..c1bc8eb 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -30,4 +30,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index dea0395..68c9288 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -30,4 +30,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml index 156104d..1ef186d 100644 --- a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -30,4 +30,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index f5e7ea0..1a3487d 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -30,4 +30,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml index 1223e52..c19c766 100644 --- a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml @@ -30,4 +30,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index ee8be90..7911fbb 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -30,4 +30,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index a5b341f..7b553b9 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -29,4 +29,4 @@ sdl2: target_platform: - osx-64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 23bb588..0e4d2de 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -29,4 +29,4 @@ sdl2: target_platform: - osx-64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index 57cfb9e..888dd6a 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -29,4 +29,4 @@ sdl2: target_platform: - osx-64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index fffe2cb..d1af14d 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -29,4 +29,4 @@ sdl2: target_platform: - osx-64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_python3.9.____73_pypy.yaml b/.ci_support/osx_64_python3.9.____73_pypy.yaml index 65df591..c46de7e 100644 --- a/.ci_support/osx_64_python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.9.____73_pypy.yaml @@ -29,4 +29,4 @@ sdl2: target_platform: - osx-64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index d5cd39f..57502fd 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -29,4 +29,4 @@ sdl2: target_platform: - osx-64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 5353ff9..51e2f19 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -29,4 +29,4 @@ sdl2: target_platform: - osx-arm64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 7531117..4393588 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -29,4 +29,4 @@ sdl2: target_platform: - osx-arm64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 8d9f793..055ac7d 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -29,4 +29,4 @@ sdl2: target_platform: - osx-arm64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index 3d209d8..e036755 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -29,4 +29,4 @@ sdl2: target_platform: - osx-arm64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 5cbea86..994c2a7 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -29,4 +29,4 @@ sdl2: target_platform: - osx-arm64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index 2034dae..bec9220 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -19,4 +19,4 @@ sdl2: target_platform: - win-64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index b65b722..2cc09ad 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -19,4 +19,4 @@ sdl2: target_platform: - win-64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml index f107143..78b9804 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -19,4 +19,4 @@ sdl2: target_platform: - win-64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml index 9bbdd1c..6c64646 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_python3.8.____cpython.yaml @@ -19,4 +19,4 @@ sdl2: target_platform: - win-64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_python3.9.____73_pypy.yaml b/.ci_support/win_64_python3.9.____73_pypy.yaml index 9f758c8..4e4ba80 100644 --- a/.ci_support/win_64_python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_python3.9.____73_pypy.yaml @@ -19,4 +19,4 @@ sdl2: target_platform: - win-64 zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index 740448c..38dc280 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -19,4 +19,4 @@ sdl2: target_platform: - win-64 zlib: -- '1.2' +- '1' diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 899ba03..ba4b251 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,6 +72,12 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff21..420f051 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} @@ -85,6 +85,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 6d54697..65650bf 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -58,6 +58,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" diff --git a/.travis.yml b/.travis.yml index b1d4331..2c9f18f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -language: generic +language: shell -matrix: +jobs: include: - env: CONFIG=linux_aarch64_python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux diff --git a/build-locally.py b/build-locally.py index e0d408d..d78427b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -3,11 +3,11 @@ # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 96e44ce..fd447de 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "0.9.0" %} +{% set version = "0.9.1" %} package: name: ale-py @@ -6,15 +6,14 @@ package: source: url: https://github.com/mgbellemare/Arcade-Learning-Environment/archive/refs/tags/v{{ version }}.tar.gz - sha256: 7625ffbb9eb6c0efc6716f34b93bc8339f2396ea5e31191a251cb31bdd363f80 + sha256: eaf60c7c3a6450decff3deee02b0c46224537d322cc2f77abed565a835f2d524 patches: # upstream avoids ninja on windows, but we don't need to - patches/0001-unconditionally-use-ninja.patch - - patches/0002-unvendor-pybind11.patch - - patches/0003-build-shared-libs.patch # [not win] - - patches/0004-avoid-vcpkg-toolchain.patch - - patches/0005-fix-python-executable.patch - - patches/0006-fix-installation-on-windows.patch + - patches/0002-build-shared-libs.patch # [not win] + - patches/0003-avoid-vcpkg-toolchain.patch + - patches/0004-fix-python-executable.patch + - patches/0005-fix-installation-on-windows.patch build: number: 0 diff --git a/recipe/patches/0001-unconditionally-use-ninja.patch b/recipe/patches/0001-unconditionally-use-ninja.patch index 47098e6..687f45e 100644 --- a/recipe/patches/0001-unconditionally-use-ninja.patch +++ b/recipe/patches/0001-unconditionally-use-ninja.patch @@ -1,14 +1,14 @@ -From 64b5954390f9c88bb13ea66446a52f9a71c97767 Mon Sep 17 00:00:00 2001 +From ced9054d41a888fabd2a03b31a9ebcc81f63a51f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 17 Jul 2022 13:48:31 +0200 -Subject: [PATCH 1/6] unconditionally use ninja +Subject: [PATCH 1/5] unconditionally use ninja --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index ff1b1c5..46ca75b 100644 +index 3bd65e4..717e943 100644 --- a/setup.py +++ b/setup.py @@ -44,10 +44,11 @@ class CMakeBuild(build_ext): @@ -33,6 +33,3 @@ index ff1b1c5..46ca75b 100644 # Single config generators are handled "normally" single_config = any(x in cmake_generator for x in {"NMake", "Ninja"}) --- -2.38.1.windows.1 - diff --git a/recipe/patches/0003-build-shared-libs.patch b/recipe/patches/0002-build-shared-libs.patch similarity index 73% rename from recipe/patches/0003-build-shared-libs.patch rename to recipe/patches/0002-build-shared-libs.patch index 6e261c1..cee024b 100644 --- a/recipe/patches/0003-build-shared-libs.patch +++ b/recipe/patches/0002-build-shared-libs.patch @@ -1,14 +1,14 @@ -From d7bae0a5992ce88c44beeb5b0cd8eccd1a693de8 Mon Sep 17 00:00:00 2001 +From c5833317dda0e1970136a6b8a91f6d3e9038446b Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Tue, 6 Dec 2022 09:16:59 +1000 -Subject: [PATCH 3/6] build shared libs +Subject: [PATCH 2/5] build shared libs --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py -index 46ca75b..8d37d57 100644 +index 717e943..a7881ea 100644 --- a/setup.py +++ b/setup.py @@ -45,6 +45,7 @@ class CMakeBuild(build_ext): @@ -19,6 +19,3 @@ index 46ca75b..8d37d57 100644 ] build_args = [] --- -2.38.1.windows.1 - diff --git a/recipe/patches/0002-unvendor-pybind11.patch b/recipe/patches/0002-unvendor-pybind11.patch deleted file mode 100644 index ec51275..0000000 --- a/recipe/patches/0002-unvendor-pybind11.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0da54df2970342fb05f70ee5bb38b7e9294227d4 Mon Sep 17 00:00:00 2001 -From: Tobias Fischer -Date: Tue, 6 Dec 2022 09:16:59 +1000 -Subject: [PATCH 2/6] unvendor pybind11 - ---- - src/python/CMakeLists.txt | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 911e280..6552462 100644 ---- a/src/python/CMakeLists.txt -+++ b/src/python/CMakeLists.txt -@@ -1,11 +1,7 @@ -+find_package(Python COMPONENTS Interpreter Development REQUIRED) - find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED) - --include(FetchContent) --FetchContent_Declare( -- pybind11 -- GIT_REPOSITORY https://github.com/pybind/pybind11 -- GIT_TAG v2.10.0) --FetchContent_MakeAvailable(pybind11) -+find_package(pybind11 CONFIG REQUIRED) - - add_library(ale-py MODULE ale_python_interface.cpp) - # Depend on the ALE and pybind11 module --- -2.38.1.windows.1 - diff --git a/recipe/patches/0004-avoid-vcpkg-toolchain.patch b/recipe/patches/0003-avoid-vcpkg-toolchain.patch similarity index 89% rename from recipe/patches/0004-avoid-vcpkg-toolchain.patch rename to recipe/patches/0003-avoid-vcpkg-toolchain.patch index 903a9d8..332006e 100644 --- a/recipe/patches/0004-avoid-vcpkg-toolchain.patch +++ b/recipe/patches/0003-avoid-vcpkg-toolchain.patch @@ -1,7 +1,7 @@ -From aec109d22ceb98287d290f62aa04308aac9e262a Mon Sep 17 00:00:00 2001 +From 96961526dd54206b0bc25b63c6686ff2af374579 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Wed, 7 Dec 2022 06:34:34 +1000 -Subject: [PATCH 4/6] avoid vcpkg toolchain +Subject: [PATCH 3/5] avoid vcpkg toolchain --- CMakeLists.txt | 15 --------------- @@ -33,6 +33,3 @@ index 2b2032e..cefe88c 100644 # Don't allow running cmake in root directory if (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR) message(FATAL_ERROR [=[ --- -2.38.1.windows.1 - diff --git a/recipe/patches/0005-fix-python-executable.patch b/recipe/patches/0004-fix-python-executable.patch similarity index 76% rename from recipe/patches/0005-fix-python-executable.patch rename to recipe/patches/0004-fix-python-executable.patch index 1c5927e..f0684ae 100644 --- a/recipe/patches/0005-fix-python-executable.patch +++ b/recipe/patches/0004-fix-python-executable.patch @@ -1,14 +1,14 @@ -From a32b4e288a7ca050e0ecbe7022bbcc28d5561963 Mon Sep 17 00:00:00 2001 +From f15d7662fe1c25e9a023ed24b807ef733d5733e0 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Wed, 7 Dec 2022 12:15:48 +1000 -Subject: [PATCH 5/6] fix python executable +Subject: [PATCH 4/5] fix python executable --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py -index 8d37d57..5cf8a39 100644 +index a7881ea..cb85844 100644 --- a/setup.py +++ b/setup.py @@ -38,6 +38,7 @@ class CMakeBuild(build_ext): @@ -19,6 +19,3 @@ index 8d37d57..5cf8a39 100644 f"-DPython3_EXECUTABLE={sys.executable}", f"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY={extdir}", "-DSDL_SUPPORT=ON", --- -2.38.1.windows.1 - diff --git a/recipe/patches/0006-fix-installation-on-windows.patch b/recipe/patches/0005-fix-installation-on-windows.patch similarity index 85% rename from recipe/patches/0006-fix-installation-on-windows.patch rename to recipe/patches/0005-fix-installation-on-windows.patch index 1c18a58..3224301 100644 --- a/recipe/patches/0006-fix-installation-on-windows.patch +++ b/recipe/patches/0005-fix-installation-on-windows.patch @@ -1,7 +1,7 @@ -From 0db188ee2de56c99ec858e25f62b7f522919dec7 Mon Sep 17 00:00:00 2001 +From a7c9e8bf0e8db2a384674413b44b16a0cc6e85dc Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Wed, 7 Dec 2022 19:40:22 +1000 -Subject: [PATCH 6/6] fix installation on windows +Subject: [PATCH 5/5] fix installation on windows --- src/CMakeLists.txt | 2 +- @@ -9,7 +9,7 @@ Subject: [PATCH 6/6] fix installation on windows 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a4de95c..ea89e7e 100644 +index b7bac39..77a3bc1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -66,7 +66,7 @@ if (BUILD_PYTHON_LIB) @@ -22,10 +22,10 @@ index a4de95c..ea89e7e 100644 include(CMakePackageConfigHelpers) diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 6552462..c24b15f 100644 +index 337b61a..b264f68 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt -@@ -15,19 +15,6 @@ set_target_properties(ale-py PROPERTIES +@@ -26,19 +26,6 @@ set_target_properties(ale-py PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}" SUFFIX "${PYTHON_MODULE_EXTENSION}") @@ -45,6 +45,3 @@ index 6552462..c24b15f 100644 # Copy over the Python source files file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR} --- -2.38.1.windows.1 -