fix: add min and max ver requirement for ipfs block put test

ipfshttpclient/client/__init__.py

@@ -21,7 +21,7 @@
 # for it to be considered compatible.
 VERSION_MINIMUM   = "0.5.0"
 VERSION_BLACKLIST = []
-VERSION_MAXIMUM   = "0.9.0"
+VERSION_MAXIMUM   = "0.19.0"
 
 from . import base
 from . import bitswap

test/functional/test_block.py

@@ -1,37 +1,90 @@
+import sys
+
 import cid
 import io
 import pytest
 
 import conftest
 
-TEST1_FILEPATH = conftest.TEST_DIR / "fake_dir" / "fsdfgh"
-TEST1_CID_STR  = "QmPevo2B1pwvDyuZyJbWVfhwkaGPee3f1kX36wFmqx1yna"
-TEST1_SIZE     = 8
+TEST1_FILEPATH  = conftest.TEST_DIR / "fake_dir" / "fsdfgh"
+TEST1_CIDV0_STR = "QmPevo2B1pwvDyuZyJbWVfhwkaGPee3f1kX36wFmqx1yna"
+TEST1_CIDV1_STR = "bafkreiatrjkbyc7fz4ain4lpdv7els2cr7h55bjzrg6pg2oo2sf47hmmum"
+TEST1_SIZE      = 8
 
 TEST2_CONTENT = b"Hello World!"
 TEST2_CID_STR = "bafkreid7qoywk77r7rj3slobqfekdvs57qwuwh5d2z3sqsw52iabe3mqne"
 TEST2_CID_OBJ = cid.make_cid(TEST2_CID_STR)
 TEST2_SIZE    = len(TEST2_CONTENT)
 
 
-@pytest.mark.dependency()
+def minversion(version):
+	import ipfshttpclient
+
+	try:
+		with ipfshttpclient.connect():
+			with ipfshttpclient.Client(offline=False) as ipfsclient:
+				max_version = tuple(map(int, version.split('-', 1)[0].split('.')))
+				daemon_version = tuple(map(int, ipfsclient.version().get('Version').split('-', 1)[0].split('.')))
+				return pytest.mark.skipif(
+					daemon_version < max_version, reason=f"Requires at least v{max_version}"
+				)
+	except ipfshttpclient.exceptions.Error as e:
+		print('\nFailed to connect to IPFS client', file=sys.stderr)
+		print(e, file=sys.stderr)
+
+		return False
+	else:
+		return True
+
+
+def maxversion(version):
+	import ipfshttpclient
+
+	try:
+		with ipfshttpclient.connect():
+			with ipfshttpclient.Client(offline=False) as ipfsclient:
+				max_version = tuple(map(int, version.split('-', 1)[0].split('.')))
+				daemon_version = tuple(map(int, ipfsclient.version().get('Version').split('-', 1)[0].split('.')))
+				return pytest.mark.skipif(
+					daemon_version > max_version, reason=f"Incompatible with >= v{max_version}"
+				)
+	except ipfshttpclient.exceptions.Error as e:
+		print('\nFailed to connect to IPFS client', file=sys.stderr)
+		print(e, file=sys.stderr)
+
+		return False
+	else:
+		return True
+
+
+@maxversion("0.12.9")
+@pytest.mark.dependency
 def test_put(client):
 	expected_keys = {"Key", "Size"}
 	res = client.block.put(TEST1_FILEPATH)
 	assert set(res.keys()).issuperset(expected_keys)
-	assert res["Key"] == TEST1_CID_STR
+	assert res["Key"] == TEST1_CIDV0_STR
+
+
+@minversion("0.13.0")
+@pytest.mark.dependency
+def test_put_cidv1(client):
+	expected_keys = {"Key", "Size"}
+	res = client.block.put(TEST1_FILEPATH)
+	assert set(res.keys()).issuperset(expected_keys)
+	assert res["Key"] == TEST1_CIDV1_STR
 
 
 @pytest.mark.dependency(depends=["test_put"])
 def test_stat(client):
 	expected_keys = {"Key", "Size"}
-	res = client.block.stat(TEST1_CID_STR)
+	res = client.block.stat(TEST1_CIDV0_STR)
 	assert set(res.keys()).issuperset(expected_keys)
 
 
 @pytest.mark.dependency(depends=["test_put"])
 def test_get(client):
-	assert len(client.block.get(TEST1_CID_STR)) == TEST1_SIZE
+	assert len(client.block.get(TEST1_CIDV0_STR)) == TEST1_SIZE
 
 
 @pytest.mark.dependency()