From c1a5351ffa5ad1c7bbccffd48af74dbefa6760c3 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 13:45:55 -0700 Subject: [PATCH 01/19] Move pip to user space Attempting to fix CI --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c266170..1ebf462 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: - name: Install pip dependencies run: | - python3 -m pip install --upgrade --upgrade-strategy eager .[test] + python3 -m pip install --user --upgrade --upgrade-strategy eager .[test] python3 -m pip freeze - name: Install apt dependencies From aff98ce1929f479f62e96c3abf50d6a5bcdab51f Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 13:57:34 -0700 Subject: [PATCH 02/19] fixup to validate working for rolling I think that this will break older that 3.12 --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1ebf462..7adbd8e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,14 +17,14 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install pip run: apt update && apt install -y python3-pip - name: Install pip dependencies run: | - python3 -m pip install --user --upgrade --upgrade-strategy eager .[test] + python3 -m pip install --break-system-packages --upgrade --upgrade-strategy eager .[test] python3 -m pip freeze - name: Install apt dependencies From a6227852f3be3c86823618159fe579438f67e0ef Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 15:46:04 -0700 Subject: [PATCH 03/19] switch to a venv --- .github/workflows/test.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7adbd8e..8b5bc21 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,15 @@ jobs: uses: actions/checkout@v4 - name: Install pip - run: apt update && apt install -y python3-pip + run: \ + VENV=$(mktemp -d) + python -m venv $VENV + if [ -f $VENV/Scripts/activate ]; then + . $VENV/Scripts/activate + else + . $VENV/bin/activate + fi + python -m pip install -U pip setuptools - name: Install pip dependencies run: | From 63b9e07a747466cc9f12fd290cf29de466a8fec0 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 15:46:46 -0700 Subject: [PATCH 04/19] no need for new argument --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8b5bc21..d2ce72d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,7 +32,7 @@ jobs: - name: Install pip dependencies run: | - python3 -m pip install --break-system-packages --upgrade --upgrade-strategy eager .[test] + python3 -m pip install --upgrade --upgrade-strategy eager .[test] python3 -m pip freeze - name: Install apt dependencies From 2380462280db72164a350b502bc1dcd33fe032fb Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 15:48:06 -0700 Subject: [PATCH 05/19] fix delimeter --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d2ce72d..d87bb2e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v4 - name: Install pip - run: \ + run: | VENV=$(mktemp -d) python -m venv $VENV if [ -f $VENV/Scripts/activate ]; then From 24300a6d77ddc7d7604ccbd4d6ce47947342fb25 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 15:49:18 -0700 Subject: [PATCH 06/19] python3 --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d87bb2e..f654134 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,13 +22,13 @@ jobs: - name: Install pip run: | VENV=$(mktemp -d) - python -m venv $VENV + python3 -m venv $VENV if [ -f $VENV/Scripts/activate ]; then . $VENV/Scripts/activate else . $VENV/bin/activate fi - python -m pip install -U pip setuptools + python3 -m pip install -U pip setuptools - name: Install pip dependencies run: | From 752cc002cc0eb11fd84dd9327f8af2ceadac517d Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 15:54:56 -0700 Subject: [PATCH 07/19] Use setup-python action --- .github/workflows/test.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f654134..3cc13e0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,14 +20,10 @@ jobs: uses: actions/checkout@v4 - name: Install pip + - uses: actions/setup-python@v5 + with: + python-version: '3.x' run: | - VENV=$(mktemp -d) - python3 -m venv $VENV - if [ -f $VENV/Scripts/activate ]; then - . $VENV/Scripts/activate - else - . $VENV/bin/activate - fi python3 -m pip install -U pip setuptools - name: Install pip dependencies From e4ab62a55b5d04444e3303d6173a321b972cb3b1 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 15:56:21 -0700 Subject: [PATCH 08/19] Update test.yml --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3cc13e0..8bf335a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,10 +19,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Install pip - uses: actions/setup-python@v5 with: python-version: '3.x' + + - name: Install pip run: | python3 -m pip install -U pip setuptools From c7574da2f16cb49a5e622d8888a967daf1e26f4f Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 15:57:37 -0700 Subject: [PATCH 09/19] pip cache --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8bf335a..6022081 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,6 +22,7 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.x' + cache: 'pip' # caching pip dependencies - name: Install pip run: | From 183c07edfdec21ee368e5d39d523a83df4175329 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 16:04:53 -0700 Subject: [PATCH 10/19] pip caching seems to be broken --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6022081..8bf335a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,6 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.x' - cache: 'pip' # caching pip dependencies - name: Install pip run: | From 18964a7c4fb522b77cad2edda4aa8c7c38fa052f Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 16:10:21 -0700 Subject: [PATCH 11/19] switching to env based backwards compat --- .github/workflows/test.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8bf335a..39c1161 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,14 +15,13 @@ jobs: container: ['ros:iron', 'ros:rolling'] container: ${{ matrix.container }} + env: + ENV PIP_BREAK_SYSTEM_PACKAGES: 1 + steps: - name: Checkout uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - with: - python-version: '3.x' - - name: Install pip run: | python3 -m pip install -U pip setuptools From ebbe8d4ac8e513c3d5b83eb4edcc2fa62dd8adf5 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 16:12:15 -0700 Subject: [PATCH 12/19] system pip again --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 39c1161..75c112b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,8 +23,7 @@ jobs: uses: actions/checkout@v4 - name: Install pip - run: | - python3 -m pip install -U pip setuptools + run: apt update && apt install -y python3-pip - name: Install pip dependencies run: | From 9467c0323c8bdb3f0dc81a88fa3659e161b1b5ca Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 16:14:12 -0700 Subject: [PATCH 13/19] fix env syntax --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 75c112b..1fbcc88 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: container: ${{ matrix.container }} env: - ENV PIP_BREAK_SYSTEM_PACKAGES: 1 + PIP_BREAK_SYSTEM_PACKAGES: 1 steps: - name: Checkout From 1b32785fe3eaab88ef44ed6e7fcfd71f5a53c6f9 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 16:32:14 -0700 Subject: [PATCH 14/19] try not upgrading --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1fbcc88..b771365 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,7 @@ jobs: - name: Install pip dependencies run: | - python3 -m pip install --upgrade --upgrade-strategy eager .[test] + python3 -m pip install .[test] python3 -m pip freeze - name: Install apt dependencies From a854692e5351d71c347a64a2bd37825d7d213c91 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 16:48:18 -0700 Subject: [PATCH 15/19] upgrade flake8 stuff explicitly --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b771365..e632f00 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,6 +27,7 @@ jobs: - name: Install pip dependencies run: | + python3 -m pip install -U pycodestyle flake8 flake8-blind-except flake8-builtins flake8-class-newline flake8-comprehension flake8-deprecated flake8-docstring flake8-import-order flake8-quotes python3 -m pip install .[test] python3 -m pip freeze From 1d9506fa2f536e9c9fd60b7e03023a11bb299ef1 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 16:49:52 -0700 Subject: [PATCH 16/19] comprehensions typo --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e632f00..d8eb0f8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,7 @@ jobs: - name: Install pip dependencies run: | - python3 -m pip install -U pycodestyle flake8 flake8-blind-except flake8-builtins flake8-class-newline flake8-comprehension flake8-deprecated flake8-docstring flake8-import-order flake8-quotes + python3 -m pip install -U pycodestyle flake8 flake8-blind-except flake8-builtins flake8-class-newline flake8-comprehensions flake8-deprecated flake8-docstring flake8-import-order flake8-quotes python3 -m pip install .[test] python3 -m pip freeze From d3eedced0a84c1f70564fa1fc607f02a6611ed08 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 10 Apr 2024 17:21:48 -0700 Subject: [PATCH 17/19] docstrings plural --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d8eb0f8..471c6e0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,7 @@ jobs: - name: Install pip dependencies run: | - python3 -m pip install -U pycodestyle flake8 flake8-blind-except flake8-builtins flake8-class-newline flake8-comprehensions flake8-deprecated flake8-docstring flake8-import-order flake8-quotes + python3 -m pip install -U pycodestyle flake8 flake8-blind-except flake8-builtins flake8-class-newline flake8-comprehensions flake8-deprecated flake8-docstrings flake8-import-order flake8-quotes python3 -m pip install .[test] python3 -m pip freeze From 689c26e408427dc6cf91534f787bbfd8864c9699 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Thu, 11 Apr 2024 10:58:13 -0700 Subject: [PATCH 18/19] install pytest explicitly --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 471c6e0..e9271c9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v4 - name: Install pip - run: apt update && apt install -y python3-pip + run: apt update && apt install -y python3-pip python3-pytest - name: Install pip dependencies run: | From 37339b9eb83f3c630abba127fbc8d263df3816d4 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Thu, 11 Apr 2024 11:06:01 -0700 Subject: [PATCH 19/19] use python3 module syntax to be more portable https://stackoverflow.com/questions/39495429/py-test-vs-pytest-command The command on jammy is pytest-3 awkwardly. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e9271c9..0792a38 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,4 +35,4 @@ jobs: run: sudo apt update && sudo apt install -y doxygen graphviz - name: Run tests - run: py.test --verbose test + run: python3 -m pytest --verbose test