Merge branch 'master' into lanctot-v1.5-python3.12

.github/workflows/actions.yml

@@ -14,27 +14,24 @@ jobs:
         # Most current platform.
         - os: ubuntu-22.04
           OS_PYTHON_VERSION: "3.11"
-          TRAVIS_USE_NOX: 0
           DEFAULT_OPTIONAL_DEPENDENCY: "ON"
           BUILD_SHARED_LIB: "OFF"
           OPEN_SPIEL_BUILD_WITH_ORTOOLS: "OFF"
           OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL: ""
         # Standard (most current) platforms and versions.
         - os: ubuntu-22.04
           OS_PYTHON_VERSION: "3.10"
-          TRAVIS_USE_NOX: 0
           DEFAULT_OPTIONAL_DEPENDENCY: "ON"
           BUILD_SHARED_LIB: "OFF"
           OPEN_SPIEL_BUILD_WITH_ORTOOLS: "ON"
           OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL: "https://github.com/google/or-tools/releases/download/v9.6/or-tools_amd64_ubuntu-22.04_cpp_v9.6.2534.tar.gz"
         - os: ubuntu-22.04
           OS_PYTHON_VERSION: "3.10"
-          TRAVIS_USE_NOX: 0
           DEFAULT_OPTIONAL_DEPENDENCY: "OFF"
           BUILD_SHARED_LIB: "OFF"
           OPEN_SPIEL_BUILD_WITH_ORTOOLS: "OFF"
           OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL: ""
-        - os: macos-14
+        - os: macos-13
           OS_PYTHON_VERSION: "3.11"
           TRAVIS_USE_NOX: 0
           DEFAULT_OPTIONAL_DEPENDENCY: "OFF"
@@ -44,15 +41,13 @@ jobs:
         # Standard or older platforms with older Python versions.
         - os: macos-12
           OS_PYTHON_VERSION: "3.9"
-          TRAVIS_USE_NOX: 0
           DEFAULT_OPTIONAL_DEPENDENCY: "OFF"
           BUILD_SHARED_LIB: "OFF"
           OPEN_SPIEL_BUILD_WITH_ORTOOLS: "OFF"
           OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL: ""
         - os: ubuntu-20.04
           OS_PYTHON_VERSION: "3.9"
           DEFAULT_OPTIONAL_DEPENDENCY: "ON"
-          TRAVIS_USE_NOX: 0
           BUILD_SHARED_LIB: "ON"
           OPEN_SPIEL_BUILD_WITH_ORTOOLS: "OFF"
           OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL: ""
@@ -64,7 +59,6 @@ jobs:
       OPEN_SPIEL_ENABLE_TENSORFLOW: ON
       OPEN_SPIEL_ENABLE_PYTHON_MISC: ON
       OS_PYTHON_VERSION: ${{ matrix.OS_PYTHON_VERSION }}
-      TRAVIS_USE_NOX:  ${{ matrix.TRAVIS_USE_NOX }}
       DEFAULT_OPTIONAL_DEPENDENCY: ${{ matrix.DEFAULT_OPTIONAL_DEPENDENCY }}
       OPEN_SPIEL_BUILD_WITH_JULIA: ${{ matrix.OPEN_SPIEL_BUILD_WITH_JULIA }}
       BUILD_SHARED_LIB:  ${{ matrix.BUILD_SHARED_LIB }}
@@ -73,7 +67,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: julia-actions/setup-julia@v1
+    - uses: julia-actions/setup-julia@v2
       with:
         version: 1.8
     - name: Ad-hoc fix

docs/install.md

@@ -74,8 +74,7 @@ issue.
 Currently there are three installation methods:
 
 1.  building from the source code and editing `PYTHONPATH`.
-2.  using `pip install` to build and testing using
-    [nox](https://nox.thea.codes/en/stable/).
+2.  using `pip install`.
 3.  installing via [Docker](https://www.docker.com).
 
 ## Summary
@@ -136,8 +135,6 @@ In a nutshell:
 
     ```bash
     python3 -m pip install .
-    python3 -m pip install nox
-    nox -s tests
     ```
 
     Optionally, use `pip install -e` to install in

open_spiel/CMakeLists.txt

@@ -113,8 +113,6 @@ openspiel_optional_dependency(OPEN_SPIEL_BUILD_WITH_GO             OFF
   "Build with support for Golang API.")
 openspiel_optional_dependency(OPEN_SPIEL_BUILD_WITH_HANABI         OFF
   "Build against the Hanabi game.")
-openspiel_optional_dependency(OPEN_SPIEL_BUILD_WITH_HIGC           OFF
-  "Build with Hidden Information Game Competition tournament support.")
 openspiel_optional_dependency(OPEN_SPIEL_BUILD_WITH_JULIA          OFF
   "Build binary for Julia.")
 openspiel_optional_dependency(OPEN_SPIEL_BUILD_WITH_LIBNOP         OFF
@@ -137,9 +135,6 @@ openspiel_optional_dependency(OPEN_SPIEL_BUILD_WITH_RUST           OFF
   "Build with support for Rust API.")
 
 if (WIN32)
-  if (OPEN_SPIEL_BUILD_WITH_HIGC)
-    message(FATAL_ERROR "HIGC not supported in Windows, please disable it.")
-  endif()
   openspiel_optional_dependency(OPEN_SPIEL_ENABLE_JAX              OFF
     "Enable JAX.")
   openspiel_optional_dependency(OPEN_SPIEL_ENABLE_PYTORCH          OFF
@@ -230,10 +225,6 @@ set (OPEN_SPIEL_OBJECTS
   $<TARGET_OBJECTS:utils>
   $<TARGET_OBJECTS:tests>
 )
-if (OPEN_SPIEL_BUILD_WITH_HIGC)
-  set(OPEN_SPIEL_OBJECTS ${OPEN_SPIEL_OBJECTS}
-     $<TARGET_OBJECTS:higc>)
-endif()
 if (OPEN_SPIEL_BUILD_WITH_HANABI)
   set(OPEN_SPIEL_OBJECTS ${OPEN_SPIEL_OBJECTS}
       $<TARGET_OBJECTS:hanabi_learning_environment>)
@@ -317,11 +308,6 @@ endif()
 
 if (OPEN_SPIEL_BUILD_WITH_PYTHON)
   add_subdirectory (python)
-  # HIGC needs pyspiel.so and corresponding PYTHONPATH to be set
-  # in order to run its tests.
-  if (OPEN_SPIEL_BUILD_WITH_HIGC)
-    add_subdirectory (higc)
-  endif()
 endif()
 
 add_subdirectory (utils)

open_spiel/games/CMakeLists.txt

@@ -206,10 +206,6 @@ if (${OPEN_SPIEL_BUILD_WITH_GAMUT})
   add_subdirectory(gamut)
 endif()
 
-
-# Uncomment to build the Ludii demo
-# add_subdirectory (ludii)
-
 add_library(bridge_double_dummy_solver OBJECT
   bridge/double_dummy_solver/include/dll.h
   bridge/double_dummy_solver/include/portab.h