diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 2f536dd416..6e2eb4db35 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -34,6 +34,15 @@ jobs: BUILD_SHARED_LIB: "OFF" OPEN_SPIEL_BUILD_WITH_ORTOOLS: "OFF" OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL: "" + - os: macos-13 + OS_PYTHON_VERSION: "3.11" + 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: "" + # Standard or older platforms with older Python versions. + # Older Python version on Ubuntu 20.04 - os: macos-12 OS_PYTHON_VERSION: "3.9" TRAVIS_USE_NOX: 0 @@ -65,8 +74,8 @@ jobs: OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL: ${{ matrix.OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL }} steps: - - uses: actions/checkout@v3 - - uses: julia-actions/setup-julia@v1 + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 with: version: 1.8 - name: Ad-hoc fix diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index f73b4c346b..bb6d42dced 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -68,7 +68,7 @@ jobs: CIBW_ENVIRONMENT: ${{ matrix.CIBW_ENVIRONMENT }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install run: | @@ -114,8 +114,9 @@ jobs: - name: Install bdist_wheel and full tests run: ./open_spiel/scripts/test_wheel.sh full `pwd` ${CI_PYBIN} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: + name: artifact-${{ matrix.os }} path: | dist/*.tar.gz ./wheelhouse/*.whl diff --git a/open_spiel/scripts/install.sh b/open_spiel/scripts/install.sh index 8ee38e1cd5..f6d137311a 100755 --- a/open_spiel/scripts/install.sh +++ b/open_spiel/scripts/install.sh @@ -306,9 +306,8 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then # Mac OSX cargo install bindgen-cli fi fi - - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py - ${PYBIN} get-pip.py + # Removed getting pip via git-pip.py. See #1200. + # brew install virtualenv # May be the required way to do this as of Python 3.12? ${PYBIN} -m pip install virtualenv else echo "The OS '$OSTYPE' is not supported (Only Linux and MacOS is). " \