diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index e4e67221f73..e84bf225ebf 100644
--- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -104,6 +104,7 @@ RDEPENDS_packagegroup-meta-python3 = "\
     python3-djangorestframework \
     python3-dnspython \
     python3-docopt \
+    python3-docutils \
     python3-dominate \
     python3-dt-schema \
     python3-dynamic-dispatch \
@@ -188,6 +189,7 @@ RDEPENDS_packagegroup-meta-python3 = "\
     python3-jdatetime \
     python3-jdcal \
     python3-jedi \
+    python3-jmespath \
     python3-jsmin \
     python3-jsonpatch \
     python3-jsonpath-rw \
diff --git a/meta-python/recipes-devtools/python/python3-alembic_1.5.7.bb b/meta-python/recipes-devtools/python/python3-alembic_1.5.8.bb
similarity index 78%
rename from meta-python/recipes-devtools/python/python3-alembic_1.5.7.bb
rename to meta-python/recipes-devtools/python/python3-alembic_1.5.8.bb
index d30e1b69634..fdf0d36b50a 100644
--- a/meta-python/recipes-devtools/python/python3-alembic_1.5.7.bb
+++ b/meta-python/recipes-devtools/python/python3-alembic_1.5.8.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c4ece55266dcdd02ce165b1ee0e490bb"
 
 inherit pypi setuptools3
 
-SRC_URI[sha256sum] = "66bbb0e7d6277b007dfe7e27237093c79b76cf4f94e6fbd0f7af6f9409546fe6"
+SRC_URI[sha256sum] = "e27fd67732c97a1c370c33169ef4578cf96436fa0e7dcfaeeef4a917d0737d56"
 
 PYPI_PACKAGE = "alembic"
 
diff --git a/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.6.1.bb b/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.6.3.bb
similarity index 73%
rename from meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.6.1.bb
rename to meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.6.3.bb
index e967958c021..0d232dcabb7 100644
--- a/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.6.1.bb
+++ b/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.6.3.bb
@@ -2,12 +2,11 @@ SUMMARY = "Backport of functools.lru_cache from Python 3.3"
 HOMEPAGE = "https://github.com/jaraco/backports.functools_lru_cache"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a33f38bbf47d48c70fe0d40e5f77498e"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6"
 
 PYPI_PACKAGE = "backports.functools_lru_cache"
 
-SRC_URI[md5sum] = "103000b21a8e683647e2ce41929f2a9d"
-SRC_URI[sha256sum] = "8fde5f188da2d593bd5bc0be98d9abc46c95bb8a9dde93429570192ee6cc2d4a"
+SRC_URI[sha256sum] = "d84e126e2a29e4fde8931ff8131240bbf30a0e7dbcc3897a8dbd8ea5ac11419c"
 
 DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
 
diff --git a/meta-python/recipes-devtools/python/python3-colorlog_4.7.2.bb b/meta-python/recipes-devtools/python/python3-colorlog_4.8.0.bb
similarity index 75%
rename from meta-python/recipes-devtools/python/python3-colorlog_4.7.2.bb
rename to meta-python/recipes-devtools/python/python3-colorlog_4.8.0.bb
index c9754ed887f..6f9b8d47a49 100644
--- a/meta-python/recipes-devtools/python/python3-colorlog_4.7.2.bb
+++ b/meta-python/recipes-devtools/python/python3-colorlog_4.8.0.bb
@@ -7,4 +7,4 @@ inherit pypi setuptools3
 
 PYPI_PACKAGE = "colorlog"
 
-SRC_URI[sha256sum] = "18d05b616438a75762d7d214b9ec3b05d274466c9f3ddd92807e755840c88251"
+SRC_URI[sha256sum] = "59b53160c60902c405cdec28d38356e09d40686659048893e026ecbd589516b1"
diff --git a/meta-python/recipes-devtools/python/python3-configshell-fb_1.1.28.bb b/meta-python/recipes-devtools/python/python3-configshell-fb_1.1.29.bb
similarity index 91%
rename from meta-python/recipes-devtools/python/python3-configshell-fb_1.1.28.bb
rename to meta-python/recipes-devtools/python/python3-configshell-fb_1.1.29.bb
index 2d9ec079a4c..70e67a1a7e5 100644
--- a/meta-python/recipes-devtools/python/python3-configshell-fb_1.1.28.bb
+++ b/meta-python/recipes-devtools/python/python3-configshell-fb_1.1.29.bb
@@ -7,7 +7,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
 SRC_URI = "git://github.com/open-iscsi/configshell-fb.git;protocol=https;branch=master"
-SRCREV = "da8f0cef114e7343a7ae96ff1db7c8c574f819be"
+SRCREV = "d74a33b69f688ed9b8b28033835303604639d4eb"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-python/recipes-devtools/python/python3-croniter_1.0.8.bb b/meta-python/recipes-devtools/python/python3-croniter_1.0.9.bb
similarity index 78%
rename from meta-python/recipes-devtools/python/python3-croniter_1.0.8.bb
rename to meta-python/recipes-devtools/python/python3-croniter_1.0.9.bb
index 0d0ac75ae0c..7b3a95011d9 100644
--- a/meta-python/recipes-devtools/python/python3-croniter_1.0.8.bb
+++ b/meta-python/recipes-devtools/python/python3-croniter_1.0.9.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=b8ee59850b882cbf623188489ea748e2"
 
 PYPI_PACKAGE = "croniter"
 
-SRC_URI[sha256sum] = "c8b830d787c9993361b74eaad7d7396090d7f2d9db41ceb4a52cb75da461c3ed"
+SRC_URI[sha256sum] = "708532f70584207e23ef2989ca40f367e6238bfe050133a1aff43e1e0e6f6092"
 
 inherit pypi setuptools3
 
diff --git a/meta-python/recipes-devtools/python/python3-django_3.1.1.bb b/meta-python/recipes-devtools/python/python3-django_3.1.7.bb
similarity index 54%
rename from meta-python/recipes-devtools/python/python3-django_3.1.1.bb
rename to meta-python/recipes-devtools/python/python3-django_3.1.7.bb
index ed6513d0c28..d22bd14e8c2 100644
--- a/meta-python/recipes-devtools/python/python3-django_3.1.1.bb
+++ b/meta-python/recipes-devtools/python/python3-django_3.1.7.bb
@@ -1,8 +1,7 @@
 require python-django.inc
 inherit setuptools3
 
-SRC_URI[md5sum] = "d5e894fb3c46064e84e9dc68a08a46d0"
-SRC_URI[sha256sum] = "59c8125ca873ed3bdae9c12b146fbbd6ed8d0f743e4cf5f5817af50c51f1fc2f"
+SRC_URI[sha256sum] = "32ce792ee9b6a0cbbec340123e229ac9f765dff8c2a4ae9247a14b2ba3a365a7"
 
 RDEPENDS_${PN} += "\
     ${PYTHON_PN}-sqlparse \
@@ -10,5 +9,5 @@ RDEPENDS_${PN} += "\
 
 # Set DEFAULT_PREFERENCE so that the LTS version of django is built by
 # default. To build the 3.x branch, 
-# PREFERRED_VERSION_python3-django = "3.1.1" can be added to local.conf
+# PREFERRED_VERSION_python3-django = "3.1.7" can be added to local.conf
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.2.bb b/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.3.bb
similarity index 71%
rename from meta-python/recipes-devtools/python/python3-djangorestframework_3.12.2.bb
rename to meta-python/recipes-devtools/python/python3-djangorestframework_3.12.3.bb
index 6742b87b2cb..a75d3f18cdf 100644
--- a/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.2.bb
+++ b/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.3.bb
@@ -5,8 +5,8 @@ HOMEPAGE = "https://pypi.python.org/pypi/djangorestframework"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7879a5a716147a784f7e524c9cf103c1"
 
-SRC_URI[md5sum] = "e70d58ee2f83f11d4efe33162bb8af3b"
-SRC_URI[sha256sum] = "0898182b4737a7b584a2c73735d89816343369f259fea932d90dc78e35d8ac33"
+SRC_URI[sha256sum] = "2fbbd5c28a1aaa1ad0b721b29e916797fc9aba9f9b3e7619da11c674880fc7aa"
+
 PYPI_PACKAGE = "djangorestframework"
 
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-docutils_0.16.bb b/meta-python/recipes-devtools/python/python3-docutils_0.16.bb
new file mode 100644
index 00000000000..44b7320cbb5
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-docutils_0.16.bb
@@ -0,0 +1,10 @@
+SUMMARY = "Docutils is a modular system for processing documentation into useful formats"
+HOMEPAGE = "https://pypi.org/project/docutils/"
+SECTION = "devel/python"
+LICENSE = "BSD-2-Clause & GPL-2.0 & Python-2.0"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7a4646907ab9083c826280b19e103106"
+
+SRC_URI[md5sum] = "9ccb6f332e23360f964de72c8ea5f0ed"
+SRC_URI[sha256sum] = "7d4e999cca74a52611773a42912088078363a30912e8822f7a3d38043b767573"
+
+inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-elementpath_2.2.0.bb b/meta-python/recipes-devtools/python/python3-elementpath_2.2.1.bb
similarity index 82%
rename from meta-python/recipes-devtools/python/python3-elementpath_2.2.0.bb
rename to meta-python/recipes-devtools/python/python3-elementpath_2.2.1.bb
index d1383c049c6..b0a73396875 100644
--- a/meta-python/recipes-devtools/python/python3-elementpath_2.2.0.bb
+++ b/meta-python/recipes-devtools/python/python3-elementpath_2.2.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/elementpath"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf"
 
-SRC_URI[sha256sum] = "3bbd0e9dcaf9ab7b2080fd4b457d67f166f7c4d1ece7348425195729059b427c"
+SRC_URI[sha256sum] = "c7b996c5624926f329f4379fbcffd5787629e08b2f8d7159d23525e9243ba637"
 
 PYPI_PACKAGE = "elementpath"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.4.4.bb b/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.5.1.bb
similarity index 67%
rename from meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.4.4.bb
rename to meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.5.1.bb
index 2755c7d6beb..3ca0227bd72 100644
--- a/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.4.4.bb
+++ b/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.5.1.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "Adds SQLAlchemy support to your Flask application."
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75"
 
-SRC_URI[md5sum] = "63a522cb82a75292dc8bc77b6d26187a"
-SRC_URI[sha256sum] = "bfc7150eaf809b1c283879302f04c42791136060c6eeb12c0c6674fb1291fae5"
+SRC_URI[sha256sum] = "2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912"
 
 PYPI_PACKAGE = "Flask-SQLAlchemy"
 
diff --git a/meta-python/recipes-devtools/python/python3-jmespath_0.10.0.bb b/meta-python/recipes-devtools/python/python3-jmespath_0.10.0.bb
new file mode 100644
index 00000000000..46976d19b3e
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-jmespath_0.10.0.bb
@@ -0,0 +1,12 @@
+SUMMARY = "JMESPath (pronounced 'james path') allows you to declaratively specify how to extract elements from a JSON document."
+HOMEPAGE = "https://pypi.org/project/jmespath/"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2683790f5fabb41a3f75b70558799eb4"
+
+SRC_URI[md5sum] = "65bdcb5fa5bcf1cc710ffa508e78e408"
+SRC_URI[sha256sum] = "b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"
+
+inherit pypi setuptools3
+
+RDEPENDS_${PN} += "python3-math python3-json python3-numbers"
diff --git a/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.2.bb b/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.6.0.bb
similarity index 77%
rename from meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.2.bb
rename to meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.6.0.bb
index 3ff7a126e77..700c70e53fa 100644
--- a/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.2.bb
+++ b/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.6.0.bb
@@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9c5c2c74370826468065c5702b8a1fcf"
 
 DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
 
-SRC_URI[sha256sum] = "5944a9b95e97de1980c65f03b79b356f30a43de48682b8bdd90aa5089f0ec1f4"
+SRC_URI[sha256sum] = "489000d368377571c6f982fba6497f2aa13c6d1facc40660963da62f5c379726"
 
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-pint_0.16.1.bb b/meta-python/recipes-devtools/python/python3-pint_0.17.bb
similarity index 83%
rename from meta-python/recipes-devtools/python/python3-pint_0.16.1.bb
rename to meta-python/recipes-devtools/python/python3-pint_0.17.bb
index d96659592ad..9a474901e99 100644
--- a/meta-python/recipes-devtools/python/python3-pint_0.16.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pint_0.17.bb
@@ -10,8 +10,7 @@ PYPI_PACKAGE := "Pint"
 
 inherit pypi ptest setuptools3
 
-SRC_URI[md5sum] = "d4a7bbdf505dee964eb1e5e6e7f80c34"
-SRC_URI[sha256sum] = "d43a2e9ae003164978b60fdf8cd920d8581e1a5991df8dded29b00f4850ec83a"
+SRC_URI[sha256sum] = "f4d0caa713239e6847a7c6eefe2427358566451fe56497d533f21fb590a3f313"
 
 DEPENDS += "python3-setuptools-scm-native"
 
diff --git a/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.17.bb b/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.18.bb
similarity index 86%
rename from meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.17.bb
rename to meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.18.bb
index 699e6028b6d..3662875839c 100644
--- a/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.17.bb
+++ b/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.18.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://python-prompt-toolkit.readthedocs.io/"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f"
 
-SRC_URI[sha256sum] = "9397a7162cf45449147ad6042fa37983a081b8a73363a5253dd4072666333137"
+SRC_URI[sha256sum] = "e1b4f11b9336a28fa11810bc623c357420f69dfdb6d2dac41ca2c21a55c033bc"
 
 inherit pypi setuptools3
 
diff --git a/meta-python/recipes-devtools/python/python3-pyflakes_2.3.0.bb b/meta-python/recipes-devtools/python/python3-pyflakes_2.3.1.bb
similarity index 80%
rename from meta-python/recipes-devtools/python/python3-pyflakes_2.3.0.bb
rename to meta-python/recipes-devtools/python/python3-pyflakes_2.3.1.bb
index 0c8956728c0..69680ddcba4 100644
--- a/meta-python/recipes-devtools/python/python3-pyflakes_2.3.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pyflakes_2.3.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/dreamhost/cliff"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=690c2d09203dc9e07c4083fc45ea981f"
 
-SRC_URI[sha256sum] = "e59fd8e750e588358f1b8885e5a4751203a0516e0ee6d34811089ac294c8806f"
+SRC_URI[sha256sum] = "f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"
 
 inherit pypi setuptools3
 
diff --git a/meta-python/recipes-devtools/python/python3-pyperf_2.1.0.bb b/meta-python/recipes-devtools/python/python3-pyperf_2.2.0.bb
similarity index 89%
rename from meta-python/recipes-devtools/python/python3-pyperf_2.1.0.bb
rename to meta-python/recipes-devtools/python/python3-pyperf_2.2.0.bb
index b57ea16eba9..70676b05f39 100644
--- a/meta-python/recipes-devtools/python/python3-pyperf_2.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pyperf_2.2.0.bb
@@ -13,7 +13,7 @@ Features: \
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=78bc2e6e87c8c61272937b879e6dc2f8"
 
-SRC_URI[sha256sum] = "1257d673d89fdcdbaec8077afeb365e7a94739c1b263572b09403cac25708ad3"
+SRC_URI[sha256sum] = "498bb4d1fe21350c2b7c1aa8bb3eae9c9979358d0b66327954bc66839fcba8b6"
 
 DEPENDS += "${PYTHON_PN}-six-native"
 
diff --git a/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2019.1.8.bb b/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.3.24.bb
similarity index 64%
rename from meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2019.1.8.bb
rename to meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.3.24.bb
index b3aced4f688..9211ac39400 100644
--- a/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2019.1.8.bb
+++ b/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.3.24.bb
@@ -2,13 +2,17 @@ DESCRIPTION = "This plugin does not provide any helpers to pytest, it does, howe
 HOMEPAGE = "https://github.com/saltstack/pytest-helpers-namespace"
 SECTION = "devel/python"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=cc99508c43d9d14fd51c7fac622ffd23"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=440a4cdb311cd7ad181efb4cba06d562"
 
-SRC_URI[md5sum] = "04ec1d8750f9b154e782a47cf8b30736"
-SRC_URI[sha256sum] = "4eff23a19f92410c0166f6dffbfa8901d3e14a80e97d70cd08428b6d597771ce"
+SRC_URI[sha256sum] = "188df5a7c52390fa27d6cd2f18e74d64a2ef0b9fb6e12f15fdf5a95f4813d25f"
 
 inherit pypi setuptools3
 
+DEPENDS += "\
+    ${PYTHON_PN}-wheel-native \
+    ${PYTHON_PN}-pip-native \
+"
+
 RDEPENDS_${PN} += " \
     ${PYTHON_PN}-pytest \
 "
diff --git a/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.2.bb b/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.3.bb
similarity index 76%
rename from meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.2.bb
rename to meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.3.bb
index e226e11b75d..a07a094479d 100644
--- a/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.2.bb
+++ b/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.3.bb
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a21b13b5a996f08f7e0b088aa38ce9c6"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/python-rfc3339-validator:"
 
-SRC_URI[md5sum] = "2c233007189d5ef21046cb2afac51a96"
-SRC_URI[sha256sum] = "c9659c3183488a1875c4d327c9873d9e92c54cdcd69dfbfae7546ad8b27baf9a"
+SRC_URI[sha256sum] = "7a578aa0740e9ee2b48356fe1f347139190c4c72e27f303b3617054efd15df32"
 
 PYPI_PACKAGE = "rfc3339_validator"
 
diff --git a/meta-python/recipes-devtools/python/python3-scrypt_0.8.17.bb b/meta-python/recipes-devtools/python/python3-scrypt_0.8.17.bb
new file mode 100644
index 00000000000..bcd58914a37
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-scrypt_0.8.17.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Bindings for the scrypt key derivation function library"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2ddf47d0ff1849bce3257ccbc1fd275c"
+HOMEPAGE="https://github.com/holgern/py-scrypt"
+
+SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch"
+
+SRC_URI[sha256sum] = "25b5075f2238be93af1cd574540a5ea01b8547f9b678aa72d22fce22577475ec"
+
+inherit pypi ptest setuptools3 dos2unix
+
+SRC_URI += " \
+    file://run-ptest \
+"
+
+RDEPENDS_${PN}-ptest += " \
+    ${PYTHON_PN}-pytest \
+"
+
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/tests
+    cp -rf ${S}/scrypt/tests/* ${D}${PTEST_PATH}/tests/
+}
diff --git a/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb b/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb
deleted file mode 100644
index 7588fc54baf..00000000000
--- a/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Bindings for the scrypt key derivation function library"
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=168ff75417f75a83e63c8875292d44dc"
-HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/overview"
-
-SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch"
-
-SRC_URI[md5sum] = "ae8e3263aa31b040c1f9c7f1e1843a56"
-SRC_URI[sha256sum] = "f8239b2d47fa1d40bc27efd231dc7083695d10c1c2ac51a99380360741e0362d"
-
-inherit pypi ptest setuptools3
-
-SRC_URI += " \
-    file://run-ptest \
-"
-
-RDEPENDS_${PN}-ptest += " \
-    ${PYTHON_PN}-pytest \
-"
-
-do_install_ptest() {
-    install -d ${D}${PTEST_PATH}/tests
-    cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-}