From c539c65c868e7408792fe851cadf2e5279a47768 Mon Sep 17 00:00:00 2001 From: Marek Wydmuch Date: Mon, 25 Sep 2023 23:37:51 +0200 Subject: [PATCH 1/2] Fix the wheels building on Windows, bump the version number --- CMakeLists.txt | 2 +- src/lib_python/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e42396964..18f8f55b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.12) # Project + versions #----------------------------------------------------------------------------------------------------------------------- -project(ViZDoom VERSION 1.2.1) +project(ViZDoom VERSION 1.2.2) set(ViZDoom_VERSION_STR ${ViZDoom_VERSION_MAJOR}.${ViZDoom_VERSION_MINOR}.${ViZDoom_VERSION_PATCH}) set(ViZDoom_VERSION_ID ${ViZDoom_VERSION_MAJOR}${ViZDoom_VERSION_MINOR}${ViZDoom_VERSION_PATCH}) diff --git a/src/lib_python/CMakeLists.txt b/src/lib_python/CMakeLists.txt index 0c326587e..2ad84d8f3 100644 --- a/src/lib_python/CMakeLists.txt +++ b/src/lib_python/CMakeLists.txt @@ -8,6 +8,9 @@ if("${BUILD_PYTHON_VERSION}" STREQUAL "") endif() set(PYBIND11_PYTHON_VERSION ${BUILD_PYTHON_VERSION}) +if(WIN32) + set(PYBIND11_FINDPYTHON True) +endif() set(VIZDOOM_PYTHON_OUTPUT_DIR ${VIZDOOM_OUTPUT_DIR}/python${BUILD_PYTHON_VERSION}) set(VIZDOOM_PYTHON_SRC_DIR ${VIZDOOM_SRC_DIR}/lib_python) From ae17371ac4c04a533c7d4e01b104172cd08faa4f Mon Sep 17 00:00:00 2001 From: Marek Wydmuch Date: Tue, 26 Sep 2023 00:06:25 +0200 Subject: [PATCH 2/2] Fix the docs for Gym wrapper --- .github/workflows/build-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index a57752d26..8dd6fc3a4 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -25,7 +25,7 @@ jobs: run: sudo apt install cmake git libboost-all-dev libsdl2-dev libopenal-dev - name: Install ViZDoom - run: pip install . + run: pip install .[gym] - name: Install docs dependencies run: pip install -r docs/requirements.txt