Skip to content

Commit c59eeec

Browse files
authored
backport Remove 3.8 from release (#18989)
* backport Remove 3.8 from release * remove 3.8 from pyproject.toml as well * black fix * go back to the check for 7 which is wrong, but wrong in a consistent way for main
1 parent 3973952 commit c59eeec

File tree

11 files changed

+24
-61
lines changed

11 files changed

+24
-61
lines changed

.github/workflows/check_wheel_availability.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,8 @@ jobs:
4343
matrix: arm
4444
- name: Intel
4545
matrix: intel
46-
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
46+
python-version: ["3.9", "3.10", "3.11", "3.12"]
4747
exclude:
48-
- os:
49-
matrix: macos
50-
arch:
51-
matrix: arm
52-
python-version: "3.8"
5348
- os:
5449
matrix: windows
5550
arch:

.github/workflows/pre-commit.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
- name: Intel
4242
matrix: intel
4343
python:
44-
- major_dot_minor: "3.8"
4544
- major_dot_minor: "3.9"
4645
- major_dot_minor: "3.10"
4746
- major_dot_minor: "3.11"

.github/workflows/test-install-scripts.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,12 @@ jobs:
220220
apt-get install --yes software-properties-common
221221
add-apt-repository --yes ppa:git-core/ppa
222222
apt-get --yes update
223-
apt-get install --yes git lsb-release sudo python3-venv
223+
apt-get install --yes git lsb-release sudo
224+
MINIMUM=3.9
225+
if ! apt satisfy --yes "python3-venv (>= ${MINIMUM})"
226+
then
227+
apt-get install --yes python${MINIMUM}-venv
228+
fi
224229
225230
- name: Add safe git directory
226231
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

.github/workflows/test-single.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,6 @@ jobs:
6666
arch:
6767
- matrix: ${{ inputs.arch }}
6868
python:
69-
- name: "3.8"
70-
file_name: "3.8"
71-
action: "3.8"
72-
apt: "3.8"
73-
install_sh: "3.8"
74-
matrix: "3.8"
75-
exclude_from:
76-
limited: True
77-
main: True
7869
- name: "3.9"
7970
file_name: "3.9"
8071
action: "3.9"
@@ -109,10 +100,6 @@ jobs:
109100
limited: True
110101
main: True
111102
exclude:
112-
- os:
113-
matrix: macos
114-
python:
115-
matrix: "3.8"
116103
- arch:
117104
matrix: arm
118105
configuration:

.github/workflows/upload-pypi-source.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ jobs:
5656
- name: Intel
5757
matrix: intel
5858
python:
59-
- major_dot_minor: "3.8"
6059
- major_dot_minor: "3.9"
6160
- major_dot_minor: "3.10"
6261
- major_dot_minor: "3.11"
@@ -68,12 +67,6 @@ jobs:
6867
python manage-mypy.py build-mypy-ini
6968
mypy
7069
exclude:
71-
- os:
72-
matrix: macos
73-
arch:
74-
matrix: arm
75-
python:
76-
major_dot_minor: "3.8"
7770
- os:
7871
matrix: windows
7972
arch:
@@ -174,7 +167,7 @@ jobs:
174167
- check
175168
strategy:
176169
matrix:
177-
python-version: [3.8]
170+
python-version: [3.10]
178171
os: [ubuntu-latest]
179172

180173
steps:

Install.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if ($null -eq (Get-Command py -ErrorAction SilentlyContinue))
4848
Exit 1
4949
}
5050

51-
$supportedPythonVersions = "3.12", "3.11", "3.10", "3.9", "3.8"
51+
$supportedPythonVersions = "3.12", "3.11", "3.10", "3.9"
5252
if ("$env:INSTALL_PYTHON_VERSION" -ne "")
5353
{
5454
$pythonVersion = $env:INSTALL_PYTHON_VERSION

chia/_tests/core/ssl/test_ssl.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,10 @@ async def test_farmer_mismatch_context(self, farmer_one_harvester_not_started, s
151151

152152
ssl_context = ssl_context_for_client(ca_private_crt_path, ca_private_key_path, pub_crt, pub_key)
153153
caplog.clear()
154-
with pytest.raises(Exception), ignore_ssl_cert_error(), caplog.at_level(
155-
logging.DEBUG, logger="asyncio"
154+
with (
155+
pytest.raises(Exception),
156+
ignore_ssl_cert_error(),
157+
caplog.at_level(logging.DEBUG, logger="asyncio"),
156158
):
157159
await establish_connection(farmer_server, self_hostname, ssl_context)
158160

chia/full_node/full_node.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1838,9 +1838,10 @@ async def add_block(
18381838
return await self.add_block(new_block, peer, bls_cache)
18391839
state_change_summary: Optional[StateChangeSummary] = None
18401840
ppp_result: Optional[PeakPostProcessingResult] = None
1841-
async with self.blockchain.priority_mutex.acquire(priority=BlockchainMutexPriority.high), enable_profiler(
1842-
self.profile_block_validation
1843-
) as pr:
1841+
async with (
1842+
self.blockchain.priority_mutex.acquire(priority=BlockchainMutexPriority.high),
1843+
enable_profiler(self.profile_block_validation) as pr,
1844+
):
18441845
# After acquiring the lock, check again, because another asyncio thread might have added it
18451846
if self.blockchain.contains_block(header_hash):
18461847
return None

install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ OPENSSL_VERSION_INT=
7474
find_python() {
7575
set +e
7676
unset BEST_VERSION
77-
for V in 312 3.12 311 3.11 310 3.10 39 3.9 38 3.8 3; do
77+
for V in 312 3.12 311 3.11 310 3.10 39 3.9 3; do
7878
if command -v python$V >/dev/null; then
7979
if [ "$BEST_VERSION" = "" ]; then
8080
BEST_VERSION=$V
@@ -138,7 +138,7 @@ if ! command -v "$INSTALL_PYTHON_PATH" >/dev/null; then
138138
fi
139139

140140
if [ "$PYTHON_MAJOR_VER" -ne "3" ] || [ "$PYTHON_MINOR_VER" -lt "7" ] || [ "$PYTHON_MINOR_VER" -ge "13" ]; then
141-
echo "Chia requires Python version >= 3.8 and < 3.13.0" >&2
141+
echo "Chia requires Python version >= 3.9 and < 3.13.0" >&2
142142
echo "Current Python version = $INSTALL_PYTHON_VERSION" >&2
143143
# If Arch, direct to Arch Wiki
144144
if type pacman >/dev/null 2>&1 && [ -f "/etc/arch-release" ]; then

poetry.lock

Lines changed: 3 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)