Perform tests for Python <3.7 on older operating system (#141)

- Fixes recent regression documented at actions/setup-python#544 - Also fixes regression for PyPy testing that needs a specified major.minor version
kjd · May 8, 2023 · 0bf27fe · 0bf27fe
1 parent 597a1fa
commit 0bf27fe
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 383 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -19,17 +19,13 @@ jobs:
           - '3.8'
           - '3.9'
           - '3.10'
-<<<<<<< Updated upstream
           - '3.11'
-=======
         include:
           - python-version: 3.5
             os: ubuntu-20.04
           - python-version: 3.6
             os: ubuntu-20.04
     runs-on: ${{ matrix.os || 'ubuntu-latest' }}
->>>>>>> Stashed changes
-
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
@@ -44,18 +40,13 @@ jobs:
   build:
     strategy:
       matrix:
-<<<<<<< Updated upstream
-        python-version: ['3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11', 'pypy-3.8']
-=======
-        python-version: ['3.7', '3.8', '3.9', '3.10', 'pypy3']
+        python-version: ['3.7', '3.8', '3.9', '3.10', 'pypy-3.9']
         include:
           - python-version: 3.5
             os: ubuntu-20.04
           - python-version: 3.6
             os: ubuntu-20.04
     runs-on: ${{ matrix.os || 'ubuntu-latest' }}
->>>>>>> Stashed changes
-
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

diff --git a/idna/idnadata.py b/idna/idnadata.py
@@ -1709,7 +1709,6 @@
         0x30a1000030fb,
         0x30fc000030ff,
         0x310500003130,
-<<<<<<< Updated upstream
         0x31a0000031c0,
         0x31f000003200,
         0x340000004dc0,
@@ -1835,7 +1834,6 @@
         0xa7d50000a7d6,
         0xa7d70000a7d8,
         0xa7d90000a7da,
-        0xa7f20000a7f5,
         0xa7f60000a7f8,
         0xa7fa0000a828,
         0xa82c0000a82d,
@@ -1889,187 +1887,6 @@
         0x102800001029d,
         0x102a0000102d1,
         0x102e0000102e1,
-=======
-        0x31A0000031C0,
-        0x31F000003200,
-        0x340000004DC0,
-        0x4E000000A48D,
-        0xA4D00000A4FE,
-        0xA5000000A60D,
-        0xA6100000A62C,
-        0xA6410000A642,
-        0xA6430000A644,
-        0xA6450000A646,
-        0xA6470000A648,
-        0xA6490000A64A,
-        0xA64B0000A64C,
-        0xA64D0000A64E,
-        0xA64F0000A650,
-        0xA6510000A652,
-        0xA6530000A654,
-        0xA6550000A656,
-        0xA6570000A658,
-        0xA6590000A65A,
-        0xA65B0000A65C,
-        0xA65D0000A65E,
-        0xA65F0000A660,
-        0xA6610000A662,
-        0xA6630000A664,
-        0xA6650000A666,
-        0xA6670000A668,
-        0xA6690000A66A,
-        0xA66B0000A66C,
-        0xA66D0000A670,
-        0xA6740000A67E,
-        0xA67F0000A680,
-        0xA6810000A682,
-        0xA6830000A684,
-        0xA6850000A686,
-        0xA6870000A688,
-        0xA6890000A68A,
-        0xA68B0000A68C,
-        0xA68D0000A68E,
-        0xA68F0000A690,
-        0xA6910000A692,
-        0xA6930000A694,
-        0xA6950000A696,
-        0xA6970000A698,
-        0xA6990000A69A,
-        0xA69B0000A69C,
-        0xA69E0000A6E6,
-        0xA6F00000A6F2,
-        0xA7170000A720,
-        0xA7230000A724,
-        0xA7250000A726,
-        0xA7270000A728,
-        0xA7290000A72A,
-        0xA72B0000A72C,
-        0xA72D0000A72E,
-        0xA72F0000A732,
-        0xA7330000A734,
-        0xA7350000A736,
-        0xA7370000A738,
-        0xA7390000A73A,
-        0xA73B0000A73C,
-        0xA73D0000A73E,
-        0xA73F0000A740,
-        0xA7410000A742,
-        0xA7430000A744,
-        0xA7450000A746,
-        0xA7470000A748,
-        0xA7490000A74A,
-        0xA74B0000A74C,
-        0xA74D0000A74E,
-        0xA74F0000A750,
-        0xA7510000A752,
-        0xA7530000A754,
-        0xA7550000A756,
-        0xA7570000A758,
-        0xA7590000A75A,
-        0xA75B0000A75C,
-        0xA75D0000A75E,
-        0xA75F0000A760,
-        0xA7610000A762,
-        0xA7630000A764,
-        0xA7650000A766,
-        0xA7670000A768,
-        0xA7690000A76A,
-        0xA76B0000A76C,
-        0xA76D0000A76E,
-        0xA76F0000A770,
-        0xA7710000A779,
-        0xA77A0000A77B,
-        0xA77C0000A77D,
-        0xA77F0000A780,
-        0xA7810000A782,
-        0xA7830000A784,
-        0xA7850000A786,
-        0xA7870000A789,
-        0xA78C0000A78D,
-        0xA78E0000A790,
-        0xA7910000A792,
-        0xA7930000A796,
-        0xA7970000A798,
-        0xA7990000A79A,
-        0xA79B0000A79C,
-        0xA79D0000A79E,
-        0xA79F0000A7A0,
-        0xA7A10000A7A2,
-        0xA7A30000A7A4,
-        0xA7A50000A7A6,
-        0xA7A70000A7A8,
-        0xA7A90000A7AA,
-        0xA7AF0000A7B0,
-        0xA7B50000A7B6,
-        0xA7B70000A7B8,
-        0xA7B90000A7BA,
-        0xA7BB0000A7BC,
-        0xA7BD0000A7BE,
-        0xA7BF0000A7C0,
-        0xA7C10000A7C2,
-        0xA7C30000A7C4,
-        0xA7C80000A7C9,
-        0xA7CA0000A7CB,
-        0xA7D10000A7D2,
-        0xA7D30000A7D4,
-        0xA7D50000A7D6,
-        0xA7D70000A7D8,
-        0xA7D90000A7DA,
-        0xA7F20000A7F5,
-        0xA7F60000A7F8,
-        0xA7FA0000A828,
-        0xA82C0000A82D,
-        0xA8400000A874,
-        0xA8800000A8C6,
-        0xA8D00000A8DA,
-        0xA8E00000A8F8,
-        0xA8FB0000A8FC,
-        0xA8FD0000A92E,
-        0xA9300000A954,
-        0xA9800000A9C1,
-        0xA9CF0000A9DA,
-        0xA9E00000A9FF,
-        0xAA000000AA37,
-        0xAA400000AA4E,
-        0xAA500000AA5A,
-        0xAA600000AA77,
-        0xAA7A0000AAC3,
-        0xAADB0000AADE,
-        0xAAE00000AAF0,
-        0xAAF20000AAF7,
-        0xAB010000AB07,
-        0xAB090000AB0F,
-        0xAB110000AB17,
-        0xAB200000AB27,
-        0xAB280000AB2F,
-        0xAB300000AB5B,
-        0xAB600000AB69,
-        0xABC00000ABEB,
-        0xABEC0000ABEE,
-        0xABF00000ABFA,
-        0xAC000000D7A4,
-        0xFA0E0000FA10,
-        0xFA110000FA12,
-        0xFA130000FA15,
-        0xFA1F0000FA20,
-        0xFA210000FA22,
-        0xFA230000FA25,
-        0xFA270000FA2A,
-        0xFB1E0000FB1F,
-        0xFE200000FE30,
-        0xFE730000FE74,
-        0x100000001000C,
-        0x1000D00010027,
-        0x100280001003B,
-        0x1003C0001003E,
-        0x1003F0001004E,
-        0x100500001005E,
-        0x10080000100FB,
-        0x101FD000101FE,
-        0x102800001029D,
-        0x102A0000102D1,
-        0x102E0000102E1,
->>>>>>> Stashed changes
         0x1030000010320,
         0x1032d00010341,
         0x103420001034a,
@@ -2089,9 +1906,7 @@
         0x1060000010737,
         0x1074000010756,
         0x1076000010768,
-        0x1078000010786,
-        0x10787000107b1,
-        0x107b2000107bb,
+        0x1078000010781,
         0x1080000010806,
         0x1080800010809,
         0x1080a00010836,
@@ -2243,7 +2058,6 @@
         0x1300000013430,
         0x1344000013456,
         0x1440000014647,
-<<<<<<< Updated upstream
         0x1680000016a39,
         0x16a4000016a5f,
         0x16a6000016a6a,
@@ -2325,82 +2139,6 @@
     ),
     'CONTEXTO': (
         0xb7000000b8,
-=======
-        0x1680000016A39,
-        0x16A4000016A5F,
-        0x16A6000016A6A,
-        0x16A7000016ABF,
-        0x16AC000016ACA,
-        0x16AD000016AEE,
-        0x16AF000016AF5,
-        0x16B0000016B37,
-        0x16B4000016B44,
-        0x16B5000016B5A,
-        0x16B6300016B78,
-        0x16B7D00016B90,
-        0x16E6000016E80,
-        0x16F0000016F4B,
-        0x16F4F00016F88,
-        0x16F8F00016FA0,
-        0x16FE000016FE2,
-        0x16FE300016FE5,
-        0x16FF000016FF2,
-        0x17000000187F8,
-        0x1880000018CD6,
-        0x18D0000018D09,
-        0x1AFF00001AFF4,
-        0x1AFF50001AFFC,
-        0x1AFFD0001AFFF,
-        0x1B0000001B123,
-        0x1B1500001B153,
-        0x1B1640001B168,
-        0x1B1700001B2FC,
-        0x1BC000001BC6B,
-        0x1BC700001BC7D,
-        0x1BC800001BC89,
-        0x1BC900001BC9A,
-        0x1BC9D0001BC9F,
-        0x1CF000001CF2E,
-        0x1CF300001CF47,
-        0x1DA000001DA37,
-        0x1DA3B0001DA6D,
-        0x1DA750001DA76,
-        0x1DA840001DA85,
-        0x1DA9B0001DAA0,
-        0x1DAA10001DAB0,
-        0x1DF000001DF1F,
-        0x1E0000001E007,
-        0x1E0080001E019,
-        0x1E01B0001E022,
-        0x1E0230001E025,
-        0x1E0260001E02B,
-        0x1E1000001E12D,
-        0x1E1300001E13E,
-        0x1E1400001E14A,
-        0x1E14E0001E14F,
-        0x1E2900001E2AF,
-        0x1E2C00001E2FA,
-        0x1E7E00001E7E7,
-        0x1E7E80001E7EC,
-        0x1E7ED0001E7EF,
-        0x1E7F00001E7FF,
-        0x1E8000001E8C5,
-        0x1E8D00001E8D7,
-        0x1E9220001E94C,
-        0x1E9500001E95A,
-        0x200000002A6E0,
-        0x2A7000002B739,
-        0x2B7400002B81E,
-        0x2B8200002CEA2,
-        0x2CEB00002EBE1,
-        0x300000003134B,
-    ),
-    "CONTEXTJ": (
-        0x200C0000200E,
-    ),
-    "CONTEXTO": (
-        0xB7000000B8,
->>>>>>> Stashed changes
         0x37500000376,
         0x5f3000005f5,
         0x6600000066a,