From a3cc715daca578be09740c8018f6488a2ef61f53 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Wed, 28 Feb 2024 18:30:03 -0300 Subject: [PATCH 01/28] Test config. --- .github/workflows/integtests.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/integtests.yaml diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml new file mode 100644 index 0000000..9b96e97 --- /dev/null +++ b/.github/workflows/integtests.yaml @@ -0,0 +1,23 @@ +name: Integration Tests + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + container-test-job: + runs-on: ubuntu-latest + container: + image: node:18 + env: + NODE_ENV: development + ports: + - 80 + volumes: + - my_docker_volume:/volume_mount + options: --cpus 1 + steps: + - name: Check for dockerenv file + run: (ls /.dockerenv && echo Found dockerenv) || (echo No dockerenv) From 7abeb4cfffe4a650895fc47f37e82a6c74077fcd Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Wed, 28 Feb 2024 18:43:14 -0300 Subject: [PATCH 02/28] Run fades in Arch --- .github/workflows/integtests.yaml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 9b96e97..ee647df 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -10,14 +10,12 @@ jobs: container-test-job: runs-on: ubuntu-latest container: - image: node:18 - env: - NODE_ENV: development - ports: - - 80 + image: archlinux:latest volumes: - - my_docker_volume:/volume_mount - options: --cpus 1 + - ${{ github.workspace }}:/project steps: - - name: Check for dockerenv file - run: (ls /.dockerenv && echo Found dockerenv) || (echo No dockerenv) + - name: Simple fades run + run: | + cd /project + ls -l + bin/fades -v -d pytest -x pytesxt --version From 38b35a33425147162ceb5517a72f55690a952e39 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Wed, 28 Feb 2024 18:47:40 -0300 Subject: [PATCH 03/28] Debug --- .github/workflows/integtests.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index ee647df..ab68794 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -12,10 +12,16 @@ jobs: container: image: archlinux:latest volumes: - - ${{ github.workspace }}:/project + - $GITHUB_WORKSPACE:/project steps: - name: Simple fades run run: | + echo "minusc" + echo ${{ github.workspace }} + echo "MAYUsc" + echo $GITHUB_WORKSPACE + echo "cd and ls" cd /project ls -l + echo "Fades" bin/fades -v -d pytest -x pytesxt --version From 44dcab7a264de3c62484f935adf994924f32ea9b Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Wed, 28 Feb 2024 18:54:44 -0300 Subject: [PATCH 04/28] Back to other env var, checkout code --- .github/workflows/integtests.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index ab68794..e282c4d 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -12,8 +12,12 @@ jobs: container: image: archlinux:latest volumes: - - $GITHUB_WORKSPACE:/project + - ${{ github.workspace }}:/project steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Simple fades run run: | echo "minusc" From 9e6557067442ede802587981981065c403293bb3 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Wed, 28 Feb 2024 22:07:30 -0300 Subject: [PATCH 05/28] Install Python first. --- .github/workflows/integtests.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index e282c4d..aeb725e 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -18,14 +18,16 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Install dependencies + run: | + pacman -Sy --noconfirm python3 - name: Simple fades run run: | - echo "minusc" echo ${{ github.workspace }} - echo "MAYUsc" echo $GITHUB_WORKSPACE - echo "cd and ls" cd /project ls -l - echo "Fades" + echo "Fades V" + bin/fades --version + echo "Fades R" bin/fades -v -d pytest -x pytesxt --version From 0e9e951efc8f10579a773068a4833cd4095334e7 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Wed, 28 Feb 2024 22:09:43 -0300 Subject: [PATCH 06/28] Rename mounted dir so script automatically fixes path. --- .github/workflows/integtests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index aeb725e..9050655 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -12,7 +12,7 @@ jobs: container: image: archlinux:latest volumes: - - ${{ github.workspace }}:/project + - ${{ github.workspace }}:/fades steps: - name: Checkout code uses: actions/checkout@v4 @@ -25,7 +25,7 @@ jobs: run: | echo ${{ github.workspace }} echo $GITHUB_WORKSPACE - cd /project + cd /fades ls -l echo "Fades V" bin/fades --version From 7b1b52e029a16924ceb0a6838cb6ed2add41cb85 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Wed, 28 Feb 2024 22:14:46 -0300 Subject: [PATCH 07/28] Also install setuptools. --- .github/workflows/integtests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 9050655..441f66e 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -20,7 +20,7 @@ jobs: fetch-depth: 0 - name: Install dependencies run: | - pacman -Sy --noconfirm python3 + pacman -Sy --noconfirm python3 python-setuptools - name: Simple fades run run: | echo ${{ github.workspace }} From 34922f9225126983bb94844e36abd35568e1130a Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Wed, 28 Feb 2024 22:17:00 -0300 Subject: [PATCH 08/28] Fixed purposefully-wrong command. --- .github/workflows/integtests.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 441f66e..60a0573 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -7,7 +7,7 @@ on: branches: [ master ] jobs: - container-test-job: + archlinux: runs-on: ubuntu-latest container: image: archlinux:latest @@ -26,8 +26,4 @@ jobs: echo ${{ github.workspace }} echo $GITHUB_WORKSPACE cd /fades - ls -l - echo "Fades V" - bin/fades --version - echo "Fades R" - bin/fades -v -d pytest -x pytesxt --version + bin/fades -v -d pytest -x pytest --version From c9f143f1e6b04b9eb76ab5f5d243f0bc374867a8 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Wed, 28 Feb 2024 22:25:40 -0300 Subject: [PATCH 09/28] Added Fedora. --- .github/workflows/integtests.yaml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 60a0573..20d8844 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -7,6 +7,7 @@ on: branches: [ master ] jobs: + archlinux: runs-on: ubuntu-latest container: @@ -23,7 +24,24 @@ jobs: pacman -Sy --noconfirm python3 python-setuptools - name: Simple fades run run: | - echo ${{ github.workspace }} - echo $GITHUB_WORKSPACE + cd /fades + bin/fades -v -d pytest -x pytest --version + + fedora: + runs-on: ubuntu-latest + container: + image: fedora:latest + volumes: + - ${{ github.workspace }}:/fades + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Install dependencies + run: | + yum install --assumeyes python3-setuptools + - name: Simple fades run + run: | cd /fades bin/fades -v -d pytest -x pytest --version From 66c5e60882d6116e13e757667a3e59a6d6fee5f3 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Wed, 28 Feb 2024 22:30:07 -0300 Subject: [PATCH 10/28] Added native (exploded). --- .github/workflows/integtests.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 20d8844..3c1bc20 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -45,3 +45,24 @@ jobs: run: | cd /fades bin/fades -v -d pytest -x pytest --version + + native: + strategy: + matrix: + os: [ubuntu-20.04, ubuntu-22.04, macos-12, macos-11, windows-2019, windows-2022] + python-version: [3.8, 3.9, "3.10", "3.11", "3.12"] + + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + + - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + # - name: Install dependencies + # run: | + # pip install -U -r requirements.txt + - name: Simple fades run + run: | + bin/fades -v -d pytest -x pytest --version From 127c80642bc0e1f5599e1265fcbe59b58d23c9b9 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Wed, 28 Feb 2024 22:31:54 -0300 Subject: [PATCH 11/28] Install setuptools. --- .github/workflows/integtests.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 3c1bc20..216d183 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -60,9 +60,9 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - # - name: Install dependencies - # run: | - # pip install -U -r requirements.txt + - name: Install dependencies + run: | + pip install -U setuptools - name: Simple fades run run: | bin/fades -v -d pytest -x pytest --version From 3d17b4424749b0f98a95f68db8e4ec9f3a3d167c Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Thu, 29 Feb 2024 10:58:05 -0300 Subject: [PATCH 12/28] Back to only fedora, incorporate test running other python version. --- .github/workflows/integtests.yaml | 86 +++++++++++++++++-------------- 1 file changed, 48 insertions(+), 38 deletions(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 216d183..de5c06f 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -8,24 +8,25 @@ on: jobs: - archlinux: - runs-on: ubuntu-latest - container: - image: archlinux:latest - volumes: - - ${{ github.workspace }}:/fades - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Install dependencies - run: | - pacman -Sy --noconfirm python3 python-setuptools - - name: Simple fades run - run: | - cd /fades - bin/fades -v -d pytest -x pytest --version + # archlinux: + # runs-on: ubuntu-latest + # container: + # image: archlinux:latest + # volumes: + # - ${{ github.workspace }}:/fades + # steps: + # - name: Checkout code + # uses: actions/checkout@v4 + # with: + # fetch-depth: 0 + # - name: Install dependencies + # run: | + # pacman -Sy --noconfirm python3 python-setuptools + # - name: Simple fades run + # run: | + # cd /fades + # bin/fades -v -d pytest -x pytest --version + fedora: runs-on: ubuntu-latest @@ -45,24 +46,33 @@ jobs: run: | cd /fades bin/fades -v -d pytest -x pytest --version - - native: - strategy: - matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-12, macos-11, windows-2019, windows-2022] - python-version: [3.8, 3.9, "3.10", "3.11", "3.12"] - - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v4 - - - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - pip install -U setuptools - - name: Simple fades run + - name: Using a different Python run: | - bin/fades -v -d pytest -x pytest --version + yum install --assumeyes python3.9 + cd /fades + export TEST_PYTHON_VERSION=3.9 + bin/fades -v --python=python3.9 -d pytest -x pytest tests/integtest.py + + # native: + # strategy: + # matrix: + # # just a selection otherwise it's too much + # # - latest OSes + # # - oldest and newest Python + # os: [ubuntu-22.04, macos-12, windows-2022] + # python-version: [3.8, "3.12"] + # + # runs-on: ${{ matrix.os }} + # steps: + # - uses: actions/checkout@v4 + # + # - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }} + # uses: actions/setup-python@v4 + # with: + # python-version: ${{ matrix.python-version }} + # - name: Install dependencies + # run: | + # pip install -U setuptools + # - name: Simple fades run + # run: | + # bin/fades -v -d pytest -x pytest --version From 2cfeb76cc3b738e538a37ff0f67907b5d9ba4080 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Thu, 29 Feb 2024 11:13:24 -0300 Subject: [PATCH 13/28] Installed virtualenv. --- .github/workflows/integtests.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index de5c06f..afa4ff8 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -48,7 +48,8 @@ jobs: bin/fades -v -d pytest -x pytest --version - name: Using a different Python run: | - yum install --assumeyes python3.9 + # XXX Facundo 2024-02-29 - remove virtualenv here as part of issue #411 work + yum install --assumeyes python3.9 python3-virtualenv cd /fades export TEST_PYTHON_VERSION=3.9 bin/fades -v --python=python3.9 -d pytest -x pytest tests/integtest.py From 47ccc607975e5b0954a8d5c149dc980694fa5ed0 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Thu, 29 Feb 2024 11:15:11 -0300 Subject: [PATCH 14/28] Added the (forgotten) test file. --- tests/integtest.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 tests/integtest.py diff --git a/tests/integtest.py b/tests/integtest.py new file mode 100644 index 0000000..6d30b36 --- /dev/null +++ b/tests/integtest.py @@ -0,0 +1,32 @@ +# Copyright 2024 Facundo Batista, Nicolás Demarchi +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 3, as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranties of +# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# For further info, check https://github.com/PyAr/fades + +"""Helper to run integration tests. + +This is not part of the regular test suite, but a test that is used in a very specific +way from the integration tests defined in the Github CI infrastructure. +""" + +import os +import sys + + +def test_assert_python_version(): + expected = os.environ["TEST_PYTHON_VERSION"] + print("========== expected") + vi = sys.version_info + current = f"{vi.major}.{vi.minor}" + assert current == expected From 7aab285acb39022c599d3c3bed7b0ade6cecbc23 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Fri, 1 Mar 2024 12:22:14 -0300 Subject: [PATCH 15/28] Enabled old arch, improved fedora, and try native. --- .github/workflows/integtests.yaml | 97 +++++++++++++++++-------------- 1 file changed, 52 insertions(+), 45 deletions(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index afa4ff8..98739e7 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -8,25 +8,25 @@ on: jobs: - # archlinux: - # runs-on: ubuntu-latest - # container: - # image: archlinux:latest - # volumes: - # - ${{ github.workspace }}:/fades - # steps: - # - name: Checkout code - # uses: actions/checkout@v4 - # with: - # fetch-depth: 0 - # - name: Install dependencies - # run: | - # pacman -Sy --noconfirm python3 python-setuptools - # - name: Simple fades run - # run: | - # cd /fades - # bin/fades -v -d pytest -x pytest --version - + archlinux: + runs-on: ubuntu-latest + container: + image: archlinux:latest + volumes: + - ${{ github.workspace }}:/fades + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Install dependencies + run: | + pacman -Sy --noconfirm python3 python-setuptools + - name: Simple fades run + run: | + cd /fades + bin/fades -v -d pytest -x pytest --version + # XXX Facundo 2024-03-01: "using a different Python" is missing here because Arch is hard fedora: runs-on: ubuntu-latest @@ -41,39 +41,46 @@ jobs: fetch-depth: 0 - name: Install dependencies run: | - yum install --assumeyes python3-setuptools + yum install --assumeyes python3.12 python3-setuptools - name: Simple fades run run: | cd /fades bin/fades -v -d pytest -x pytest --version - name: Using a different Python run: | - # XXX Facundo 2024-02-29 - remove virtualenv here as part of issue #411 work + # XXX Facundo 2024-02-29 - remove virtualenv in this install as part of issue #411 work yum install --assumeyes python3.9 python3-virtualenv cd /fades export TEST_PYTHON_VERSION=3.9 - bin/fades -v --python=python3.9 -d pytest -x pytest tests/integtest.py + python3.12 bin/fades -v --python=python3.9 -d pytest -x pytest -v tests/integtest.py - # native: - # strategy: - # matrix: - # # just a selection otherwise it's too much - # # - latest OSes - # # - oldest and newest Python - # os: [ubuntu-22.04, macos-12, windows-2022] - # python-version: [3.8, "3.12"] - # - # runs-on: ${{ matrix.os }} - # steps: - # - uses: actions/checkout@v4 - # - # - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }} - # uses: actions/setup-python@v4 - # with: - # python-version: ${{ matrix.python-version }} - # - name: Install dependencies - # run: | - # pip install -U setuptools - # - name: Simple fades run - # run: | - # bin/fades -v -d pytest -x pytest --version + native: + strategy: + matrix: + # just a selection otherwise it's too much + # - latest OSes + # - oldest and newest Python + os: [ubuntu-22.04, macos-12, windows-2022] + python-version: [3.8, "3.12"] + + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + + - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + pip install -U setuptools + - name: Simple fades run + run: | + bin/fades -v -d pytest -x pytest --version + - name: Using a different Python + run: | + # apt update ??? + apt install -y python3.10 python3.10-venv python3-virtualenv + cd /fades + export TEST_PYTHON_VERSION=3.10 + python${{ matrix.python-version }} bin/fades -v --python=python3.10 -d pytest -x pytest -v tests/integtest.py From afee622d48cdaea2d241827ba47f3e97cd017b84 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Sat, 2 Mar 2024 08:02:32 -0300 Subject: [PATCH 16/28] Install with sudo. --- .github/workflows/integtests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 98739e7..0a4dae6 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -80,7 +80,7 @@ jobs: - name: Using a different Python run: | # apt update ??? - apt install -y python3.10 python3.10-venv python3-virtualenv + sudo apt install -y python3.10 python3.10-venv python3-virtualenv cd /fades export TEST_PYTHON_VERSION=3.10 python${{ matrix.python-version }} bin/fades -v --python=python3.10 -d pytest -x pytest -v tests/integtest.py From b6b4a3b6c4d306b1c87f45e4c7975c21984c1d48 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Sat, 2 Mar 2024 08:05:46 -0300 Subject: [PATCH 17/28] Install Python using an action so it's multiplatform. --- .github/workflows/integtests.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 0a4dae6..012efd6 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -71,6 +71,10 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} + - name: Also set up Python 3.10 for cross-Python test + uses: actions/setup-python@v4 + with: + python-version: 3.10 - name: Install dependencies run: | pip install -U setuptools @@ -79,8 +83,6 @@ jobs: bin/fades -v -d pytest -x pytest --version - name: Using a different Python run: | - # apt update ??? - sudo apt install -y python3.10 python3.10-venv python3-virtualenv cd /fades export TEST_PYTHON_VERSION=3.10 python${{ matrix.python-version }} bin/fades -v --python=python3.10 -d pytest -x pytest -v tests/integtest.py From 99302aec47d61a99bb7a949f846b109a112a8a5b Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Sat, 2 Mar 2024 08:07:16 -0300 Subject: [PATCH 18/28] It's yaml, silly --- .github/workflows/integtests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 012efd6..7c3a494 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -74,7 +74,7 @@ jobs: - name: Also set up Python 3.10 for cross-Python test uses: actions/setup-python@v4 with: - python-version: 3.10 + python-version: "3.10" - name: Install dependencies run: | pip install -U setuptools From 50f22218913482e8e2cd7ea126e0e87aa218739e Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Sat, 2 Mar 2024 08:08:36 -0300 Subject: [PATCH 19/28] Native we're already in working dir. --- .github/workflows/integtests.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 7c3a494..2f6d137 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -83,6 +83,5 @@ jobs: bin/fades -v -d pytest -x pytest --version - name: Using a different Python run: | - cd /fades export TEST_PYTHON_VERSION=3.10 python${{ matrix.python-version }} bin/fades -v --python=python3.10 -d pytest -x pytest -v tests/integtest.py From 0500a12dade981443a83ae3c39b668ee448867ff Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Sat, 2 Mar 2024 10:59:08 -0300 Subject: [PATCH 20/28] Use the matrix Python in the simple run. --- .github/workflows/integtests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 2f6d137..4d65d85 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -80,7 +80,7 @@ jobs: pip install -U setuptools - name: Simple fades run run: | - bin/fades -v -d pytest -x pytest --version + python${{ matrix.python-version }} bin/fades -v -d pytest -x pytest --version - name: Using a different Python run: | export TEST_PYTHON_VERSION=3.10 From d3e8da53b796fc6999270c3fdbb46bb4fd25d159 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Sat, 2 Mar 2024 11:00:51 -0300 Subject: [PATCH 21/28] Install setuptools using the matrix Python. --- .github/workflows/integtests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 4d65d85..1a81f97 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -77,7 +77,7 @@ jobs: python-version: "3.10" - name: Install dependencies run: | - pip install -U setuptools + python${{ matrix.python-version }} -m pip install -U setuptools - name: Simple fades run run: | python${{ matrix.python-version }} bin/fades -v -d pytest -x pytest --version From a0da9d5a666ce9bfb6d3f5a12dd7565e458b7872 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Sat, 2 Mar 2024 11:08:53 -0300 Subject: [PATCH 22/28] Disabled untill 411. --- .github/workflows/integtests.yaml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 1a81f97..932ae57 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -71,17 +71,23 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - - name: Also set up Python 3.10 for cross-Python test - uses: actions/setup-python@v4 - with: - python-version: "3.10" + + # XXX Facundo 2024-03-02 - disabled until we enable the cross test below + # - name: Also set up Python 3.10 for cross-Python test + # uses: actions/setup-python@v4 + # with: + # python-version: "3.10" + - name: Install dependencies run: | python${{ matrix.python-version }} -m pip install -U setuptools - name: Simple fades run run: | python${{ matrix.python-version }} bin/fades -v -d pytest -x pytest --version - - name: Using a different Python - run: | - export TEST_PYTHON_VERSION=3.10 - python${{ matrix.python-version }} bin/fades -v --python=python3.10 -d pytest -x pytest -v tests/integtest.py + + # XXX Facundo 2024-03-02 - commented out as until we finish issue #411 work we need 'virtualenv' and it's a + # hassle to install it in a multiplatform way -- this should be enabled while working on that issue + # - name: Using a different Python + # run: | + # export TEST_PYTHON_VERSION=3.10 + # python${{ matrix.python-version }} bin/fades -v --python=python3.10 -d pytest -x pytest -v tests/integtest.py From f645dd1357bbaea01b5f60945e4ad544f295cf9b Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Sat, 2 Mar 2024 11:21:00 -0300 Subject: [PATCH 23/28] Try to find exec path in windows. --- .github/workflows/integtests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 932ae57..197cede 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -80,6 +80,7 @@ jobs: - name: Install dependencies run: | + python3 -c "import sys;print(sys.executable)" python${{ matrix.python-version }} -m pip install -U setuptools - name: Simple fades run run: | From 8fb87dfcab8b8f1e6d3395ed1b831560aa5ccc4a Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Sat, 2 Mar 2024 11:32:28 -0300 Subject: [PATCH 24/28] Try to find exec path in windows, 2. --- .github/workflows/integtests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 197cede..e1f09f0 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -81,6 +81,7 @@ jobs: - name: Install dependencies run: | python3 -c "import sys;print(sys.executable)" + python -c "import sys;print(sys.executable)" python${{ matrix.python-version }} -m pip install -U setuptools - name: Simple fades run run: | From 21e0ae9840351908338dbff895ff2d66c516ab7a Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Sat, 2 Mar 2024 11:35:23 -0300 Subject: [PATCH 25/28] Try to find exec path in windows, 3. --- .github/workflows/integtests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index e1f09f0..4848fcf 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -81,7 +81,7 @@ jobs: - name: Install dependencies run: | python3 -c "import sys;print(sys.executable)" - python -c "import sys;print(sys.executable)" + python3 -c "import sys, os; print(os.path.dirname(sys.executable)); print('\n'.join(os.listdir(os.path.dirname(sys.executable))))" python${{ matrix.python-version }} -m pip install -U setuptools - name: Simple fades run run: | From 9cd821a93cfa9a4675ff7d52c22791a0d87ab99e Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Sat, 2 Mar 2024 11:39:29 -0300 Subject: [PATCH 26/28] Try to find exec path in windows, 4. --- .github/workflows/integtests.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index 4848fcf..f269ebd 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -68,7 +68,8 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 + id: matrixpy with: python-version: ${{ matrix.python-version }} @@ -82,7 +83,8 @@ jobs: run: | python3 -c "import sys;print(sys.executable)" python3 -c "import sys, os; print(os.path.dirname(sys.executable)); print('\n'.join(os.listdir(os.path.dirname(sys.executable))))" - python${{ matrix.python-version }} -m pip install -U setuptools + echo "======== path?" ${{ steps.matrixpy.outputs.python-path }} + ${{ steps.matrixpy.outputs.python-path }} -m pip install -U setuptools - name: Simple fades run run: | python${{ matrix.python-version }} bin/fades -v -d pytest -x pytest --version From 491c4cb5843427b822a2bdae6e0d132f4586bc5f Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Sat, 2 Mar 2024 11:42:20 -0300 Subject: [PATCH 27/28] Full use of the provided python path. --- .github/workflows/integtests.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integtests.yaml b/.github/workflows/integtests.yaml index f269ebd..b7b81de 100644 --- a/.github/workflows/integtests.yaml +++ b/.github/workflows/integtests.yaml @@ -81,17 +81,14 @@ jobs: - name: Install dependencies run: | - python3 -c "import sys;print(sys.executable)" - python3 -c "import sys, os; print(os.path.dirname(sys.executable)); print('\n'.join(os.listdir(os.path.dirname(sys.executable))))" - echo "======== path?" ${{ steps.matrixpy.outputs.python-path }} ${{ steps.matrixpy.outputs.python-path }} -m pip install -U setuptools - name: Simple fades run run: | - python${{ matrix.python-version }} bin/fades -v -d pytest -x pytest --version + ${{ steps.matrixpy.outputs.python-path }} bin/fades -v -d pytest -x pytest --version # XXX Facundo 2024-03-02 - commented out as until we finish issue #411 work we need 'virtualenv' and it's a # hassle to install it in a multiplatform way -- this should be enabled while working on that issue # - name: Using a different Python # run: | # export TEST_PYTHON_VERSION=3.10 - # python${{ matrix.python-version }} bin/fades -v --python=python3.10 -d pytest -x pytest -v tests/integtest.py + # ${{ steps.matrixpy.outputs.python-path }} bin/fades -v --python=python3.10 -d pytest -x pytest -v tests/integtest.py From 03a6eb393793977a8b6ff2a58d14bba43bf1e5a2 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Mon, 4 Mar 2024 11:13:29 -0300 Subject: [PATCH 28/28] Removed debug line. --- tests/integtest.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/integtest.py b/tests/integtest.py index 6d30b36..392a8bd 100644 --- a/tests/integtest.py +++ b/tests/integtest.py @@ -26,7 +26,6 @@ def test_assert_python_version(): expected = os.environ["TEST_PYTHON_VERSION"] - print("========== expected") vi = sys.version_info current = f"{vi.major}.{vi.minor}" assert current == expected