From 1ed9ed4f923ca40e0b43a72bff9e90d38db3a3bb Mon Sep 17 00:00:00 2001
From: Andrey Rakhmatullin <wrar@wrar.name>
Date: Mon, 2 Oct 2023 21:33:02 +0400
Subject: [PATCH] Require pyftpdlib that supports Python 3.12.

---
 tests/requirements.txt       | 3 +--
 tests/test_feedexport.py     | 3 ---
 tests/test_pipeline_files.py | 5 -----
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 3ea7f3333..7178fb5b8 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,7 +1,6 @@
 # Tests requirements
 attrs
-# https://github.com/giampaolo/pyftpdlib/issues/560
-pyftpdlib; python_version < "3.12"
+pyftpdlib >= 1.5.8
 pytest
 pytest-cov==4.0.0
 pytest-xdist
diff --git a/tests/test_feedexport.py b/tests/test_feedexport.py
index 6b82974fa..56967c0d5 100644
--- a/tests/test_feedexport.py
+++ b/tests/test_feedexport.py
@@ -125,9 +125,6 @@ class FileFeedStorageTest(unittest.TestCase):
             path.unlink()
 
 
-@pytest.mark.skipif(
-    sys.version_info >= (3, 12), reason="pyftpdlib doesn't support Python 3.12 yet"
-)
 class FTPFeedStorageTest(unittest.TestCase):
     def get_test_spider(self, settings=None):
         class TestSpider(scrapy.Spider):
diff --git a/tests/test_pipeline_files.py b/tests/test_pipeline_files.py
index bf96f17b6..468751446 100644
--- a/tests/test_pipeline_files.py
+++ b/tests/test_pipeline_files.py
@@ -1,7 +1,6 @@
 import dataclasses
 import os
 import random
-import sys
 import time
 from datetime import datetime
 from io import BytesIO
@@ -12,7 +11,6 @@ from unittest import mock
 from urllib.parse import urlparse
 
 import attr
-import pytest
 from itemadapter import ItemAdapter
 from twisted.internet import defer
 from twisted.trial import unittest
@@ -648,9 +646,6 @@ class TestGCSFilesStore(unittest.TestCase):
                     store.bucket.get_blob.assert_called_with(expected_blob_path)
 
 
-@pytest.mark.skipif(
-    sys.version_info >= (3, 12), reason="pyftpdlib doesn't support Python 3.12 yet"
-)
 class TestFTPFileStore(unittest.TestCase):
     @defer.inlineCallbacks
     def test_persist(self):