From 86640a8a9645384ff0a9db908dea42332f1f57fb Mon Sep 17 00:00:00 2001 From: "Nicholas H.Tollervey" Date: Mon, 3 Jun 2024 20:40:03 +0100 Subject: [PATCH 1/3] Minor update to README.md --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 1bda61f6e..50f7c1cb5 100644 --- a/README.rst +++ b/README.rst @@ -5,7 +5,7 @@ Mu - A Simple Python Code Editor Mu is a simple code editor for beginner programmers based on extensive feedback from teachers and learners. Having said that, Mu is for anyone who wants to use -a simple "no frills" editor. +a simple "no frills" editor. Most importantly, have fun! Mu is a modal editor with modes for many different ways to use Python to create cool and interesting things. From 774c96df4394a587b27a8c6b8766ad1146b468c0 Mon Sep 17 00:00:00 2001 From: Carlos Pereira Atencio Date: Tue, 25 Jun 2024 19:48:28 +0100 Subject: [PATCH 2/3] CI: Fix issue pip installing with Py3.5 & avoid using mac arm64. --- .github/workflows/test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 669670d24..bbeba7755 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,8 @@ jobs: timeout-minutes: 30 strategy: matrix: - os: [ubuntu-20.04, ubuntu-latest, macos-11, macos-latest, windows-2019, windows-latest] + # macos-13 is x86 and macos-14 is arm64 + os: [ubuntu-20.04, ubuntu-latest, macos-11, macos-13, windows-2019, windows-latest] python-version: ['3.5', '3.6', '3.7', '3.8'] exclude: # Python 3.5 and 3.6 not available in the latest Ubuntu runners @@ -28,6 +29,10 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + env: + # Workaround to issue using Python 3.5 + # https://github.com/actions/setup-python/issues/866 + PIP_TRUSTED_HOST: "pypi.python.org pypi.org files.pythonhosted.org" - name: Display Python info run: | python -c "import sys; print(sys.version)" From 7641d7ada71a986f895ebd8a26d2ee2f52c3f1fe Mon Sep 17 00:00:00 2001 From: Carlos Pereira Atencio Date: Tue, 25 Jun 2024 22:37:08 +0100 Subject: [PATCH 3/3] CI: Set ssh-action specific version to workaround issue in main branch. --- .github/workflows/test.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bbeba7755..7d9b7baba 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -117,7 +117,7 @@ jobs: - name: Wait 2m30s for the docker image to start up QEMU and Raspberry Pi OS run: sleep 150 - name: Clone project & setup it as the bash entry directory - uses: appleboy/ssh-action@master + uses: appleboy/ssh-action@v1.0.3 with: host: rpios username: pi @@ -134,7 +134,7 @@ jobs: # As Pi OS stretch is no longer supported the repository URL was moved and is no longer updated - name: Update Stretch sources.list if: ${{ matrix.docker-tag == 'stretch-2018-03-13' }} - uses: appleboy/ssh-action@master + uses: appleboy/ssh-action@v1.0.3 with: host: rpios username: pi @@ -142,7 +142,7 @@ jobs: port: ${{ job.services.rpios.ports[5022] }} script: echo "deb http://legacy.raspbian.org/raspbian/ stretch main contrib non-free rpi" | sudo tee /etc/apt/sources.list - name: Install Mu extra apt dependencies - uses: appleboy/ssh-action@master + uses: appleboy/ssh-action@v1.0.3 with: host: rpios username: pi @@ -152,22 +152,22 @@ jobs: sudo apt-get update sudo apt-get install -y python3-virtualenv - name: Create venv and install Python dependencies - uses: appleboy/ssh-action@master + uses: appleboy/ssh-action@v1.0.3 with: host: rpios username: pi password: raspberry port: ${{ job.services.rpios.ports[5022] }} - command_timeout: 20m + command_timeout: 25m script: | python3 -m virtualenv ~/mu/.venv -v --python=python3 --system-site-packages echo "source ~/mu/.venv/bin/activate" > ~/.bashrc_new && cat ~/.bashrc >> ~/.bashrc_new rm ~/.bashrc && mv ~/.bashrc_new ~/.bashrc source .venv/bin/activate python -m pip list - python -m pip install ."[dev]" + python -m pip install ".[dev]" - name: Environment info - uses: appleboy/ssh-action@master + uses: appleboy/ssh-action@v1.0.3 with: host: rpios username: pi @@ -180,7 +180,7 @@ jobs: python3 -m pip --version python3 -m pip list - name: Run tests - uses: appleboy/ssh-action@master + uses: appleboy/ssh-action@v1.0.3 with: host: rpios username: pi