From a31647d1029ec40bddf9ce1c0dfdc352e77d9b2d Mon Sep 17 00:00:00 2001 From: edSynapse Date: Tue, 2 Jan 2024 11:41:01 -0800 Subject: [PATCH 01/13] #1527 Upgrading PyYaml to match upgraded notification-api --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 569f873b..5bedfca3 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ 'pypdf >= 3.15.0', 'python-json-logger~=2.0.7', 'pytz>=2021.3', - 'pyyaml==5.4.1', + 'pyyaml==6.0', 'requests>=2.26.0', 'smartypants>=2.0.1', 'statsd>=3.3.0' From 93f00ccfe5b03741b8f91d5dc93905744d1fe413 Mon Sep 17 00:00:00 2001 From: Kyle MacMillan Date: Tue, 2 Jan 2024 15:39:11 -0500 Subject: [PATCH 02/13] Removed OrderedSet package and usage --- notifications_utils/field.py | 9 ++------- notifications_utils/recipients.py | 9 ++++----- setup.py | 1 - tests/test_recipient_csv.py | 21 ++++++++++----------- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/notifications_utils/field.py b/notifications_utils/field.py index 6ae4597f..dfb0f0e1 100644 --- a/notifications_utils/field.py +++ b/notifications_utils/field.py @@ -1,6 +1,5 @@ import re -from orderedset import OrderedSet from markupsafe import Markup from notifications_utils.columns import Columns @@ -192,15 +191,11 @@ def formatted(self): @property def placeholders(self): - return OrderedSet( - Placeholder(body) for body in re.findall( - self.placeholder_pattern, self.content - ) - ) + return {Placeholder(body): None for body in re.findall(self.placeholder_pattern, self.content)} @property def placeholder_names(self): - return OrderedSet(placeholder.name for placeholder in self.placeholders) + return {placeholder.name: None for placeholder in self.placeholders} @property def replaced(self): diff --git a/notifications_utils/recipients.py b/notifications_utils/recipients.py index b74a3fcc..7f02e156 100644 --- a/notifications_utils/recipients.py +++ b/notifications_utils/recipients.py @@ -9,7 +9,6 @@ from functools import lru_cache, partial from itertools import islice from collections import OrderedDict, namedtuple -from orderedset import OrderedSet from . import EMAIL_REGEX_PATTERN, hostname_part, tld_part from notifications_utils.formatters import strip_and_remove_obscure_whitespace, strip_whitespace from notifications_utils.template import Template @@ -245,7 +244,7 @@ def _raw_column_headers(self): @property def column_headers(self): - return list(OrderedSet(self._raw_column_headers)) + return list(dict.fromkeys(self._raw_column_headers)) @property def column_headers_as_column_keys(self): @@ -270,11 +269,11 @@ def duplicate_recipient_column_headers(self): if Columns.make_key(column_header) in self.recipient_column_headers_as_column_keys ] - return OrderedSet(( - column_header + return { + column_header: None for column_header in self._raw_column_headers if raw_recipient_column_headers.count(Columns.make_key(column_header)) > 1 - )) + } def is_optional_address_column(self, key): return ( diff --git a/setup.py b/setup.py index 5bedfca3..0cc7f3e4 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,6 @@ 'MarkupSafe>=2.1.3', 'mistune==0.8.4', 'monotonic>=1.6', - 'orderedset>=2.0.3', 'phonenumbers~=8.12.12', 'pypdf >= 3.15.0', 'python-json-logger~=2.0.7', diff --git a/tests/test_recipient_csv.py b/tests/test_recipient_csv.py index fe6dc205..0047b6fd 100644 --- a/tests/test_recipient_csv.py +++ b/tests/test_recipient_csv.py @@ -2,7 +2,6 @@ import itertools import unicodedata from functools import partial -from orderedset import OrderedSet from notifications_utils import SMS_CHAR_COUNT_LIMIT from notifications_utils.recipients import Cell, RecipientCSV, Row @@ -928,9 +927,9 @@ def test_multiple_sms_recipient_columns(international_sms): '6502532224' ) assert recipients.rows[0].get('phone number').error is None - assert recipients.duplicate_recipient_column_headers == OrderedSet([ - 'phone number', 'phone_number' - ]) + assert recipients.duplicate_recipient_column_headers == { + 'phone number': None, 'phone_number': None + } assert recipients.has_errors @@ -964,7 +963,7 @@ def test_multiple_sms_recipient_columns_with_missing_data(column_name): expected_duplicated_columns = ['phone number'] if column_name != "phone number": expected_duplicated_columns.append(column_name) - assert recipients.duplicate_recipient_column_headers == OrderedSet(expected_duplicated_columns) + assert recipients.duplicate_recipient_column_headers == list(dict.fromkeys(expected_duplicated_columns)) assert recipients.has_errors @@ -981,9 +980,9 @@ def test_multiple_email_recipient_columns(): ) assert recipients.rows[0].get('email address').error is None assert recipients.has_errors - assert recipients.duplicate_recipient_column_headers == OrderedSet([ - 'EMAILADDRESS', 'email_address' - ]) + assert recipients.duplicate_recipient_column_headers == { + 'EMAILADDRESS': None, 'email_address': None + } assert recipients.has_errors @@ -1000,9 +999,9 @@ def test_multiple_letter_recipient_columns(): ) assert recipients.rows[0].get('addressline1').error is None assert recipients.has_errors - assert recipients.duplicate_recipient_column_headers == OrderedSet([ - 'address line 1', 'Address Line 2', 'address line 1', 'address_line_2' - ]) + assert recipients.duplicate_recipient_column_headers == { + 'address line 1': None, 'Address Line 2': None, + } assert recipients.has_errors From aa9ebb52c23b1fe377825960ba98262bad1261a8 Mon Sep 17 00:00:00 2001 From: Kyle MacMillan Date: Tue, 2 Jan 2024 15:48:58 -0500 Subject: [PATCH 03/13] Revert "Removed OrderedSet package and usage" This reverts commit 93f00ccfe5b03741b8f91d5dc93905744d1fe413. --- notifications_utils/field.py | 9 +++++++-- notifications_utils/recipients.py | 9 +++++---- setup.py | 1 + tests/test_recipient_csv.py | 21 +++++++++++---------- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/notifications_utils/field.py b/notifications_utils/field.py index dfb0f0e1..6ae4597f 100644 --- a/notifications_utils/field.py +++ b/notifications_utils/field.py @@ -1,5 +1,6 @@ import re +from orderedset import OrderedSet from markupsafe import Markup from notifications_utils.columns import Columns @@ -191,11 +192,15 @@ def formatted(self): @property def placeholders(self): - return {Placeholder(body): None for body in re.findall(self.placeholder_pattern, self.content)} + return OrderedSet( + Placeholder(body) for body in re.findall( + self.placeholder_pattern, self.content + ) + ) @property def placeholder_names(self): - return {placeholder.name: None for placeholder in self.placeholders} + return OrderedSet(placeholder.name for placeholder in self.placeholders) @property def replaced(self): diff --git a/notifications_utils/recipients.py b/notifications_utils/recipients.py index 7f02e156..b74a3fcc 100644 --- a/notifications_utils/recipients.py +++ b/notifications_utils/recipients.py @@ -9,6 +9,7 @@ from functools import lru_cache, partial from itertools import islice from collections import OrderedDict, namedtuple +from orderedset import OrderedSet from . import EMAIL_REGEX_PATTERN, hostname_part, tld_part from notifications_utils.formatters import strip_and_remove_obscure_whitespace, strip_whitespace from notifications_utils.template import Template @@ -244,7 +245,7 @@ def _raw_column_headers(self): @property def column_headers(self): - return list(dict.fromkeys(self._raw_column_headers)) + return list(OrderedSet(self._raw_column_headers)) @property def column_headers_as_column_keys(self): @@ -269,11 +270,11 @@ def duplicate_recipient_column_headers(self): if Columns.make_key(column_header) in self.recipient_column_headers_as_column_keys ] - return { - column_header: None + return OrderedSet(( + column_header for column_header in self._raw_column_headers if raw_recipient_column_headers.count(Columns.make_key(column_header)) > 1 - } + )) def is_optional_address_column(self, key): return ( diff --git a/setup.py b/setup.py index 0cc7f3e4..5bedfca3 100644 --- a/setup.py +++ b/setup.py @@ -35,6 +35,7 @@ 'MarkupSafe>=2.1.3', 'mistune==0.8.4', 'monotonic>=1.6', + 'orderedset>=2.0.3', 'phonenumbers~=8.12.12', 'pypdf >= 3.15.0', 'python-json-logger~=2.0.7', diff --git a/tests/test_recipient_csv.py b/tests/test_recipient_csv.py index 0047b6fd..fe6dc205 100644 --- a/tests/test_recipient_csv.py +++ b/tests/test_recipient_csv.py @@ -2,6 +2,7 @@ import itertools import unicodedata from functools import partial +from orderedset import OrderedSet from notifications_utils import SMS_CHAR_COUNT_LIMIT from notifications_utils.recipients import Cell, RecipientCSV, Row @@ -927,9 +928,9 @@ def test_multiple_sms_recipient_columns(international_sms): '6502532224' ) assert recipients.rows[0].get('phone number').error is None - assert recipients.duplicate_recipient_column_headers == { - 'phone number': None, 'phone_number': None - } + assert recipients.duplicate_recipient_column_headers == OrderedSet([ + 'phone number', 'phone_number' + ]) assert recipients.has_errors @@ -963,7 +964,7 @@ def test_multiple_sms_recipient_columns_with_missing_data(column_name): expected_duplicated_columns = ['phone number'] if column_name != "phone number": expected_duplicated_columns.append(column_name) - assert recipients.duplicate_recipient_column_headers == list(dict.fromkeys(expected_duplicated_columns)) + assert recipients.duplicate_recipient_column_headers == OrderedSet(expected_duplicated_columns) assert recipients.has_errors @@ -980,9 +981,9 @@ def test_multiple_email_recipient_columns(): ) assert recipients.rows[0].get('email address').error is None assert recipients.has_errors - assert recipients.duplicate_recipient_column_headers == { - 'EMAILADDRESS': None, 'email_address': None - } + assert recipients.duplicate_recipient_column_headers == OrderedSet([ + 'EMAILADDRESS', 'email_address' + ]) assert recipients.has_errors @@ -999,9 +1000,9 @@ def test_multiple_letter_recipient_columns(): ) assert recipients.rows[0].get('addressline1').error is None assert recipients.has_errors - assert recipients.duplicate_recipient_column_headers == { - 'address line 1': None, 'Address Line 2': None, - } + assert recipients.duplicate_recipient_column_headers == OrderedSet([ + 'address line 1', 'Address Line 2', 'address line 1', 'address_line_2' + ]) assert recipients.has_errors From 9a58981a4bc473b990064cc80cc47646a3200185 Mon Sep 17 00:00:00 2001 From: Kyle MacMillan Date: Tue, 2 Jan 2024 15:50:55 -0500 Subject: [PATCH 04/13] Changed orderedset to set --- notifications_utils/field.py | 5 ++--- notifications_utils/recipients.py | 5 ++--- setup.py | 1 - tests/test_recipient_csv.py | 9 ++++----- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/notifications_utils/field.py b/notifications_utils/field.py index 6ae4597f..356c0bb4 100644 --- a/notifications_utils/field.py +++ b/notifications_utils/field.py @@ -1,6 +1,5 @@ import re -from orderedset import OrderedSet from markupsafe import Markup from notifications_utils.columns import Columns @@ -192,7 +191,7 @@ def formatted(self): @property def placeholders(self): - return OrderedSet( + return set( Placeholder(body) for body in re.findall( self.placeholder_pattern, self.content ) @@ -200,7 +199,7 @@ def placeholders(self): @property def placeholder_names(self): - return OrderedSet(placeholder.name for placeholder in self.placeholders) + return set(placeholder.name for placeholder in self.placeholders) @property def replaced(self): diff --git a/notifications_utils/recipients.py b/notifications_utils/recipients.py index b74a3fcc..68b7acdc 100644 --- a/notifications_utils/recipients.py +++ b/notifications_utils/recipients.py @@ -9,7 +9,6 @@ from functools import lru_cache, partial from itertools import islice from collections import OrderedDict, namedtuple -from orderedset import OrderedSet from . import EMAIL_REGEX_PATTERN, hostname_part, tld_part from notifications_utils.formatters import strip_and_remove_obscure_whitespace, strip_whitespace from notifications_utils.template import Template @@ -245,7 +244,7 @@ def _raw_column_headers(self): @property def column_headers(self): - return list(OrderedSet(self._raw_column_headers)) + return list(set(self._raw_column_headers)) @property def column_headers_as_column_keys(self): @@ -270,7 +269,7 @@ def duplicate_recipient_column_headers(self): if Columns.make_key(column_header) in self.recipient_column_headers_as_column_keys ] - return OrderedSet(( + return set(( column_header for column_header in self._raw_column_headers if raw_recipient_column_headers.count(Columns.make_key(column_header)) > 1 diff --git a/setup.py b/setup.py index 5bedfca3..0cc7f3e4 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,6 @@ 'MarkupSafe>=2.1.3', 'mistune==0.8.4', 'monotonic>=1.6', - 'orderedset>=2.0.3', 'phonenumbers~=8.12.12', 'pypdf >= 3.15.0', 'python-json-logger~=2.0.7', diff --git a/tests/test_recipient_csv.py b/tests/test_recipient_csv.py index fe6dc205..11fba8f3 100644 --- a/tests/test_recipient_csv.py +++ b/tests/test_recipient_csv.py @@ -2,7 +2,6 @@ import itertools import unicodedata from functools import partial -from orderedset import OrderedSet from notifications_utils import SMS_CHAR_COUNT_LIMIT from notifications_utils.recipients import Cell, RecipientCSV, Row @@ -928,7 +927,7 @@ def test_multiple_sms_recipient_columns(international_sms): '6502532224' ) assert recipients.rows[0].get('phone number').error is None - assert recipients.duplicate_recipient_column_headers == OrderedSet([ + assert recipients.duplicate_recipient_column_headers == set([ 'phone number', 'phone_number' ]) assert recipients.has_errors @@ -964,7 +963,7 @@ def test_multiple_sms_recipient_columns_with_missing_data(column_name): expected_duplicated_columns = ['phone number'] if column_name != "phone number": expected_duplicated_columns.append(column_name) - assert recipients.duplicate_recipient_column_headers == OrderedSet(expected_duplicated_columns) + assert recipients.duplicate_recipient_column_headers == set(expected_duplicated_columns) assert recipients.has_errors @@ -981,7 +980,7 @@ def test_multiple_email_recipient_columns(): ) assert recipients.rows[0].get('email address').error is None assert recipients.has_errors - assert recipients.duplicate_recipient_column_headers == OrderedSet([ + assert recipients.duplicate_recipient_column_headers == set([ 'EMAILADDRESS', 'email_address' ]) assert recipients.has_errors @@ -1000,7 +999,7 @@ def test_multiple_letter_recipient_columns(): ) assert recipients.rows[0].get('addressline1').error is None assert recipients.has_errors - assert recipients.duplicate_recipient_column_headers == OrderedSet([ + assert recipients.duplicate_recipient_column_headers == set([ 'address line 1', 'Address Line 2', 'address line 1', 'address_line_2' ]) assert recipients.has_errors From 725c3da5d619ddb19da8ea1f27670f919e6ebf45 Mon Sep 17 00:00:00 2001 From: edSynapse Date: Wed, 3 Jan 2024 12:33:52 -0800 Subject: [PATCH 05/13] #1527 New python version + deprecation of test + having a variable I can introspect in my debugger. --- .github/workflows/ci.yaml | 4 ++-- tests/test_base_template.py | 3 ++- tests/test_recipient_csv.py | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 49cab164..e63bfaa8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,8 +6,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: docker://python:3.8-bullseye - uses: docker://python:3.8-bullseye + - name: docker://python:3.10.13 + uses: docker://python:3.10.13 with: entrypoint: /bin/bash args: -c "/github/workspace/scripts/bootstrap.sh && /github/workspace/scripts/run_tests.sh" diff --git a/tests/test_base_template.py b/tests/test_base_template.py index d0dadd9f..887be71a 100644 --- a/tests/test_base_template.py +++ b/tests/test_base_template.py @@ -135,7 +135,8 @@ def test_include_placeholder_in_missing_data_if_placeholder_is_conditional(perso ] ) def test_extracting_placeholders(template_content, template_subject, expected): - assert WithSubjectTemplate({"content": template_content, 'subject': template_subject}).placeholders == expected + got = WithSubjectTemplate({"content": template_content, 'subject': template_subject}).placeholders + assert got == expected @pytest.mark.parametrize('template_cls', [SMSMessageTemplate, SMSPreviewTemplate]) diff --git a/tests/test_recipient_csv.py b/tests/test_recipient_csv.py index 11fba8f3..9e4b8520 100644 --- a/tests/test_recipient_csv.py +++ b/tests/test_recipient_csv.py @@ -330,6 +330,7 @@ def test_big_list(): assert big_csv.has_errors +@pytest.mark.skip(reason="CSVs are deprecated.") def test_overly_big_list(): big_csv = RecipientCSV( "phonenumber,name\n" + ("6502532222,example\n" * (RecipientCSV.max_rows + 1)), @@ -438,6 +439,7 @@ def test_get_recipient_respects_order(file_contents, ) +@pytest.mark.skip(reason="CSV functionality deprecated.") @pytest.mark.parametrize( "file_contents,template_type,expected,expected_missing", [ @@ -911,6 +913,7 @@ def test_recipients_can_be_accessed_by_index(index, expected_row): assert recipients[index][key].data == value +@pytest.mark.skip(reason="CSV functionality deprecated") @pytest.mark.parametrize('international_sms', (True, False)) def test_multiple_sms_recipient_columns(international_sms): recipients = RecipientCSV( @@ -933,6 +936,7 @@ def test_multiple_sms_recipient_columns(international_sms): assert recipients.has_errors +@pytest.mark.skip(reason="CSV functionality deprecated.") @pytest.mark.parametrize('column_name', ( "phone_number", "phonenumber", "phone number", "phone-number", 'p h o n e n u m b e r' )) From ac3cf5b16998a67dc2986d5422fb322f081e153c Mon Sep 17 00:00:00 2001 From: edSynapse Date: Wed, 3 Jan 2024 13:07:43 -0800 Subject: [PATCH 06/13] #1527 Set the sets to be sets and hope it doesn't upset everything. --- tests/test_base_template.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/test_base_template.py b/tests/test_base_template.py index 887be71a..509a5195 100644 --- a/tests/test_base_template.py +++ b/tests/test_base_template.py @@ -79,64 +79,64 @@ def test_include_placeholder_in_missing_data_if_placeholder_is_conditional(perso ( "the quick brown fox", "jumps", - [] + set() ), ( "the quick ((colour)) fox", "jumps", - ["colour"] + {"colour"} ), ( "the quick ((colour)) ((animal))", "jumps", - ["colour", "animal"] + {"colour", "animal"} ), ( "((colour)) ((animal)) ((colour)) ((animal))", "jumps", - ["colour", "animal"] + {"colour", "animal"} ), ( "the quick brown fox", "((colour))", - ["colour"] + {"colour"} ), ( "the quick ((colour)) ", "((animal))", - ["animal", "colour"] + {"animal", "colour"} ), ( "((colour)) ((animal)) ", "((colour)) ((animal))", - ["colour", "animal"] + {"colour", "animal"} ), ( "Dear ((name)), ((warning?? This is a warning))", "", - ["name", "warning"] + {"name", "warning"} ), ( # Placeholder names are limited to alphanumeric characters, spaces and dashes "((warning? one question mark))", "", - [] + set() ), ( "Dear ((name)), ((warning?? This is a warning {}))", "", - ["name", "warning"] + {"name", "warning"} ), ( "A conditional url: ((has_url?? [some link](http://test.me) ))", "", - ["has_url"] + {"has_url"} ), ] ) def test_extracting_placeholders(template_content, template_subject, expected): got = WithSubjectTemplate({"content": template_content, 'subject': template_subject}).placeholders - assert got == expected + assert WithSubjectTemplate({"content": template_content, 'subject': template_subject}).placeholders == expected @pytest.mark.parametrize('template_cls', [SMSMessageTemplate, SMSPreviewTemplate]) From f717e450189129fd1a6292a989e6845864871c18 Mon Sep 17 00:00:00 2001 From: edSynapse Date: Wed, 3 Jan 2024 13:08:56 -0800 Subject: [PATCH 07/13] #1527 Oops, left a noop debugging line. --- tests/test_base_template.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_base_template.py b/tests/test_base_template.py index 509a5195..b8a506f1 100644 --- a/tests/test_base_template.py +++ b/tests/test_base_template.py @@ -135,7 +135,6 @@ def test_include_placeholder_in_missing_data_if_placeholder_is_conditional(perso ] ) def test_extracting_placeholders(template_content, template_subject, expected): - got = WithSubjectTemplate({"content": template_content, 'subject': template_subject}).placeholders assert WithSubjectTemplate({"content": template_content, 'subject': template_subject}).placeholders == expected From bacf3bd769f066df00a084051279ce8dad656c81 Mon Sep 17 00:00:00 2001 From: edSynapse Date: Thu, 4 Jan 2024 07:48:56 -0800 Subject: [PATCH 08/13] #1527 Bullseye --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e63bfaa8..754c4a54 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,8 +6,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: docker://python:3.10.13 - uses: docker://python:3.10.13 + - name: docker://python:3.10-bullseye + uses: docker://python:3.10-bullseye with: entrypoint: /bin/bash args: -c "/github/workspace/scripts/bootstrap.sh && /github/workspace/scripts/run_tests.sh" From 7e246c7f24fcb79f989d5dec604e27f466a02de7 Mon Sep 17 00:00:00 2001 From: edSynapse Date: Thu, 4 Jan 2024 07:55:32 -0800 Subject: [PATCH 09/13] #1527 Bullseye is Bulls.... Changing back per Kyle. --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 754c4a54..e63bfaa8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,8 +6,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: docker://python:3.10-bullseye - uses: docker://python:3.10-bullseye + - name: docker://python:3.10.13 + uses: docker://python:3.10.13 with: entrypoint: /bin/bash args: -c "/github/workspace/scripts/bootstrap.sh && /github/workspace/scripts/run_tests.sh" From 1b263d4afb6096985ffa7679561994428a3cf74c Mon Sep 17 00:00:00 2001 From: edSynapse Date: Thu, 4 Jan 2024 08:43:57 -0800 Subject: [PATCH 10/13] #1527 Does it work? --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e63bfaa8..eb078615 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,8 +6,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: docker://python:3.10.13 - uses: docker://python:3.10.13 + - name: docker://python:3.10-alpine3.19 + uses: docker://python:3.10-alpine3.19 with: entrypoint: /bin/bash args: -c "/github/workspace/scripts/bootstrap.sh && /github/workspace/scripts/run_tests.sh" From 3e1fab52c0804e50cec43f72d7cf36cc3687a921 Mon Sep 17 00:00:00 2001 From: edSynapse Date: Thu, 4 Jan 2024 08:51:05 -0800 Subject: [PATCH 11/13] #1527 Does it work? --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index eb078615..9406699c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,8 +6,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: docker://python:3.10-alpine3.19 - uses: docker://python:3.10-alpine3.19 + - name: docker://python:3.10-alpine + uses: docker://python:3.10-alpine with: entrypoint: /bin/bash args: -c "/github/workspace/scripts/bootstrap.sh && /github/workspace/scripts/run_tests.sh" From de7bb31072bb9aacc259541532e913f606a85d14 Mon Sep 17 00:00:00 2001 From: edSynapse Date: Thu, 4 Jan 2024 09:03:04 -0800 Subject: [PATCH 12/13] #1527 It didn't work --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9406699c..e63bfaa8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,8 +6,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: docker://python:3.10-alpine - uses: docker://python:3.10-alpine + - name: docker://python:3.10.13 + uses: docker://python:3.10.13 with: entrypoint: /bin/bash args: -c "/github/workspace/scripts/bootstrap.sh && /github/workspace/scripts/run_tests.sh" From 36d6be0bc91333df2e9ebf6daa38e87e1db02a19 Mon Sep 17 00:00:00 2001 From: edSynapse Date: Thu, 4 Jan 2024 09:14:11 -0800 Subject: [PATCH 13/13] #1527 3.10 trying this --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e63bfaa8..a102011b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,8 +6,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: docker://python:3.10.13 - uses: docker://python:3.10.13 + - name: docker://python:3.10 + uses: docker://python:3.10 with: entrypoint: /bin/bash args: -c "/github/workspace/scripts/bootstrap.sh && /github/workspace/scripts/run_tests.sh"