From 19fd8d69e26b5fc9b8c4a0d98b6609ce54de12d0 Mon Sep 17 00:00:00 2001 From: rocky Date: Wed, 7 Aug 2024 18:02:43 -0400 Subject: [PATCH] Sync with other Mathics3 workflows --- .github/workflows/consistency-checks.yml | 4 ++-- .github/workflows/isort-and-black-checks.yml | 6 +++--- .github/workflows/osx.yml | 6 +++--- .github/workflows/ubuntu.yml | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/consistency-checks.yml b/.github/workflows/consistency-checks.yml index 1068936..7fb0817 100644 --- a/.github/workflows/consistency-checks.yml +++ b/.github/workflows/consistency-checks.yml @@ -13,9 +13,9 @@ jobs: matrix: python-version: ['3.10'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/.github/workflows/isort-and-black-checks.yml b/.github/workflows/isort-and-black-checks.yml index 1b7863f..6bc2ac5 100644 --- a/.github/workflows/isort-and-black-checks.yml +++ b/.github/workflows/isort-and-black-checks.yml @@ -3,17 +3,17 @@ # Othewrwise, Black is run and its changes are committed back to the incoming pull request. # https://github.com/cclauss/autoblack -name: autoblack +name: isort and black on: [pull_request] jobs: build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up Python 3.11 + - name: Set up Python 3.9 uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: 3.9 - name: Install click run: pip install 'click==8.0.4' - name: Install Black diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index c26f685..1a72265 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -15,11 +15,11 @@ jobs: strategy: matrix: os: [macOS] - python-version: ['3.9', '3.10'] + python-version: ['3.9'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install OS dependencies diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 1ac2304..ccba994 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -8,15 +8,15 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: matrix: # python-version: ['3.9', '3.10'] # Figure out what's wrong here. python-version: ['3.11'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -26,9 +26,9 @@ jobs: # Can comment out when next Mathics3 core and Mathics-scanner are released # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full] # python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full] - git clone --branch fixes_for_the_new_module_organization https://github.com/Mathics3/mathics-core + git clone https://github.com/Mathics3/mathics-core (cd mathics-core && pip3 install -e .[full]) - (cd mathics-core && bash ./admin-tools/make-op-tables.sh) + (cd mathics-core && bash ./admin-tools/make-op-tables.sh) # python -m pip install Mathics3[full] - name: install pymathics natlang run: |