diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index a450ffb5..00000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: "CodeQL" - -on: - push: - branches: [ "main" ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ "main" ] - schedule: - - cron: '36 13 * * 4' - -# Declare default permissions as read only. -permissions: read-all - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'python' ] - - steps: - - name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 diff --git a/.github/workflows/pylint-examples.yml b/.github/workflows/pylint-examples.yml deleted file mode 100644 index 51f4ec26..00000000 --- a/.github/workflows/pylint-examples.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: pylint-examples - -on: - push: - branches: - - main - paths: - - '.github/actions/install-examples/action.yml' - - '.github/actions/install-meltingpot/action.yml' - - '.github/workflows/pylint-examples.yml' - - '.pylintrc' - - 'examples/**' - - 'meltingpot/**' - - 'setup.py' - pull_request: - branches: - - main - paths: - - '.github/actions/install-examples/action.yml' - - '.github/actions/install-meltingpot/action.yml' - - '.github/workflows/pylint-examples.yml' - - '.pylintrc' - - 'examples/**' - - 'meltingpot/**' - - 'setup.py' - workflow_dispatch: - -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} - cancel-in-progress: true - -permissions: read-all - -jobs: - pylint: - name: Lint examples - runs-on: ubuntu-latest - timeout-minutes: 5 - steps: - - name: Checkout Melting Pot - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - - - name: Install examples - uses: ./.github/actions/install-examples - - - name: Run PyLint on examples - run: pylint --errors-only examples diff --git a/.github/workflows/pylint-meltingpot.yml b/.github/workflows/pylint-meltingpot.yml deleted file mode 100644 index b25ef0de..00000000 --- a/.github/workflows/pylint-meltingpot.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: pylint-meltingpot - -on: - push: - branches: - - main - paths: - - '.github/actions/install-meltingpot/action.yml' - - '.github/workflows/pylint-meltingpot.yml' - - '.pylintrc' - - 'meltingpot/**' - - 'setup.py' - pull_request: - branches: - - main - paths: - - '.github/actions/install-meltingpot/action.yml' - - '.github/workflows/pylint-meltingpot.yml' - - '.pylintrc' - - 'meltingpot/**' - - 'setup.py' - workflow_dispatch: - -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} - cancel-in-progress: true - -permissions: read-all - -jobs: - pylint: - name: Lint Melting Pot - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - name: Checkout Melting Pot - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - - - name: Install Melting Pot - uses: ./.github/actions/install-meltingpot - - - name: Run PyLint on Melting Pot - run: pylint --errors-only meltingpot diff --git a/.github/workflows/pytype-examples.yml b/.github/workflows/pytype-examples.yml deleted file mode 100644 index 6603f3b7..00000000 --- a/.github/workflows/pytype-examples.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: pytype-examples - -on: - push: - branches: - - main - paths: - - '.github/actions/install-examples/action.yml' - - '.github/actions/install-meltingpot/action.yml' - - '.github/workflows/pytype-examples.yml' - - 'examples/**' - - 'meltingpot/**' - - 'pyproject.toml' - - 'setup.py' - pull_request: - branches: - - main - paths: - - '.github/actions/install-examples/action.yml' - - '.github/actions/install-meltingpot/action.yml' - - '.github/workflows/pytype-examples.yml' - - 'examples/**' - - 'meltingpot/**' - - 'pyproject.toml' - - 'setup.py' - workflow_dispatch: - -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} - cancel-in-progress: true - -permissions: read-all - -jobs: - pytype: - name: Typecheck examples - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - name: Checkout Melting Pot - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - - - name: Install examples - uses: ./.github/actions/install-examples - - - name: Run PyType on examples - run: pytype examples diff --git a/.github/workflows/pytype-meltingpot.yml b/.github/workflows/pytype-meltingpot.yml deleted file mode 100644 index ccc45302..00000000 --- a/.github/workflows/pytype-meltingpot.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: pytype-meltingpot - -on: - push: - branches: - - main - paths: - - '.github/actions/install-meltingpot/action.yml' - - '.github/workflows/pytype-meltingpot.yml' - - 'meltingpot/**' - - 'pyproject.toml' - - 'setup.py' - pull_request: - branches: - - main - paths: - - '.github/actions/install-meltingpot/action.yml' - - '.github/workflows/pytype-meltingpot.yml' - - 'meltingpot/**' - - 'pyproject.toml' - - 'setup.py' - workflow_dispatch: - -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} - cancel-in-progress: true - -permissions: read-all - -jobs: - pytype: - name: Typecheck Melting Pot - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - name: Checkout Melting Pot - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - - - name: Install Melting Pot - uses: ./.github/actions/install-meltingpot - - - name: Run PyType on Melting Pot - run: pytype meltingpot diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml deleted file mode 100644 index 7a08f06c..00000000 --- a/.github/workflows/scorecards-analysis.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: Scorecards supply-chain security -on: - # Only the default branch is supported. - branch_protection_rule: - schedule: - - cron: '17 10 * * 0' - push: - branches: [ "main" ] - -# Declare default permissions as read only. -permissions: read-all - -jobs: - analysis: - name: Scorecards analysis - runs-on: ubuntu-latest - permissions: - # Needed to upload the results to code-scanning dashboard. - security-events: write - # Used to receive a badge. (Upcoming feature) - id-token: write - # Needs for private repositories. - contents: read - actions: read - - steps: - - name: "Checkout code" - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - with: - persist-credentials: false - - - name: "Run analysis" - uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 - with: - results_file: results.sarif - results_format: sarif - # (Optional) Read-only PAT token. Uncomment the `repo_token` line below if: - # - you want to enable the Branch-Protection check on a *public* repository, or - # - you are installing Scorecards on a *private* repository - # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat. - # repo_token: ${{ secrets.SCORECARD_READ_TOKEN }} - - # Publish the results for public repositories to enable scorecard badges. For more details, see - # https://github.com/ossf/scorecard-action#publishing-results. - # For private repositories, `publish_results` will automatically be set to `false`, regardless - # of the value entered here. - publish_results: true - - # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF - # format to the repository Actions tab. - - name: "Upload artifact" - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 - with: - name: SARIF file - path: results.sarif - retention-days: 5 - - # Upload the results to GitHub's code scanning dashboard. - - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 - with: - sarif_file: results.sarif diff --git a/.github/workflows/test-meltingpot.yml b/.github/workflows/test-meltingpot.yml index 2e74cacb..680dc754 100644 --- a/.github/workflows/test-meltingpot.yml +++ b/.github/workflows/test-meltingpot.yml @@ -7,6 +7,7 @@ on: paths: - '.github/actions/install-meltingpot/action.yml' - '.github/workflows/test-meltingpot.yml' + - '.pylintrc' - 'meltingpot/**' - 'pyproject.toml' - 'setup.py' @@ -16,6 +17,7 @@ on: paths: - '.github/actions/install-meltingpot/action.yml' - '.github/workflows/test-meltingpot.yml' + - '.pylintrc' - 'meltingpot/**' - 'pyproject.toml' - 'setup.py' @@ -28,26 +30,86 @@ concurrency: permissions: read-all jobs: - pytest: - name: Test Melting Pot - runs-on: ${{ matrix.os }} - env: - SYSTEM_VERSION_COMPAT: 0 # See https://github.com/actions/setup-python/issues/279. - timeout-minutes: 180 - strategy: - fail-fast: ${{ github.event_name != 'workflow_dispatch' }} - matrix: - os: - - macos-12 - - ubuntu-20.04 - python-version: - - '3.11' + # pytest: + # name: Test Melting Pot + # runs-on: ${{ matrix.os }} + # env: + # SYSTEM_VERSION_COMPAT: 0 # See https://github.com/actions/setup-python/issues/279. + # timeout-minutes: 180 + # strategy: + # fail-fast: ${{ github.event_name != 'workflow_dispatch' }} + # matrix: + # os: + # - macos-12 + # - ubuntu-20.04 + # python-version: + # - '3.11' + # steps: + # - name: Checkout Melting Pot + # uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + + # - name: Install Melting Pot + # uses: ./.github/actions/install-meltingpot + # with: + # python-version: ${{ matrix.python-version }} + + # - name: Test Melting Pot + # run: pytest meltingpot + + # - name: Run PyLint on Melting Pot + # run: pylint --errors-only meltingpot + + # - name: Run PyType on Melting Pot + # run: pytype meltingpot + preinstall-concordia: + name: Preinstall Concordia + runs-on: ubuntu.latest + timeout-minutes: 30 + steps: + # - name: Checkout Concordia + # uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + # - name: Install Concordia + # uses: ./.github/actions/install-concordia + - run: exit 0 + + test-concordia: + name: Test Concordia + needs: preinstall-concordia + runs-on: ubuntu.latest + timeout-minutes: 30 + steps: + # - name: Checkout Concordia + # uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + # - name: Install Concordia + # uses: ./.github/actions/install-concordia + # - name: Typecheck Concordia + # run: pytest concordia + - run: exit 0 + + pytype-concordia: + name: Typecheck Concordia + needs: preinstall-concordia + runs-on: ubuntu.latest + timeout-minutes: 30 + steps: + # - name: Checkout Concordia + # uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + # - name: Install Concordia + # uses: ./.github/actions/install-concordia + # - name: Typecheck Concordia + # run: pytype concordia + - run: exit 1 + + pylint-concordia: + name: Lint Concordia + needs: preinstall-concordia + runs-on: ubuntu.latest + timeout-minutes: 30 steps: - - name: Checkout Melting Pot - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - - name: Install Melting Pot - uses: ./.github/actions/install-meltingpot - with: - python-version: ${{ matrix.python-version }} - - name: Test Melting Pot - run: pytest meltingpot + # - name: Checkout Concordia + # uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + # - name: Install Concordia + # uses: ./.github/actions/install-concordia + # - name: Lint Concordia + # run: pylint --errors-only concordia + - run: exit 1 diff --git a/examples/requirements.txt b/examples/requirements.txt index a745641b..aa4d9385 100644 --- a/examples/requirements.txt +++ b/examples/requirements.txt @@ -8,7 +8,7 @@ matplotlib ml_collections numpy pettingzoo>=1.22.3 -ray[rllib,default]==2.5.0 +ray[rllib,default]==2.37.0 stable_baselines3 supersuit>=3.7.2 torch