From 1f7d93eede061d3c2378250b8e4947d060fe2ae2 Mon Sep 17 00:00:00 2001
From: jvmncs <jvmncs@gmail.com>
Date: Tue, 3 Jan 2023 10:07:03 -0500
Subject: [PATCH 1/2] bump pyo3 and drop clippy allowance

---
 Cargo.lock | 30 ++++++++++++++++++++----------
 Cargo.toml |  2 +-
 Makefile   |  4 +---
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4e66b05..5a7d740 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -441,6 +441,15 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.13.0"
@@ -549,13 +558,14 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.16.5"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e6302e85060011447471887705bb7838f14aba43fcb06957d823739a496b3dc"
+checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543"
 dependencies = [
  "cfg-if",
  "indoc",
  "libc",
+ "memoffset",
  "parking_lot",
  "pyo3-build-config",
  "pyo3-ffi",
@@ -565,9 +575,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.16.5"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b65b546c35d8a3b1b2f0ddbac7c6a569d759f357f2b9df884f5d6b719152c8"
+checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -575,9 +585,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.16.5"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c275a07127c1aca33031a563e384ffdd485aee34ef131116fcd58e3430d1742b"
+checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -585,9 +595,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.16.5"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284fc4485bfbcc9850a6d661d627783f18d19c2ab55880b021671c4ba83e90f7"
+checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -597,9 +607,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.16.5"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53bda0f58f73f5c5429693c96ed57f7abdb38fdfc28ae06da4101a257adb7faf"
+checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index eb938e9..8a4e646 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,5 +13,5 @@ crate-type = ["cdylib"]
 hpke-rs = { version = "0.1.0", features = ["hazmat"] }
 hpke-rs-crypto = { version = "0.1.1" }
 hpke-rs-rust-crypto = { version = "0.1.1" }
-pyo3 = { version = "0.16.5", features = ["extension-module"] }
+pyo3 = { version = "0.17", features = ["extension-module"] }
 rand = { version =  "0.8" }
diff --git a/Makefile b/Makefile
index bdb0ffa..46ce6c7 100644
--- a/Makefile
+++ b/Makefile
@@ -28,9 +28,7 @@ fmt:
 .PHONY: lint
 lint:
 	cargo fmt --all -- --check
-	# temporarily allow borrow-deref-ref until this issue is resolved:
-	# https://github.com/rust-lang/rust-clippy/issues/8971
-	cargo clippy --all-targets -- -D warnings --no-deps -A clippy::borrow-deref-ref
+	cargo clippy --all-targets -- -D warnings --no-deps
 	flake8 .
 
 .PHONY: clean

From 470923843025cfea5865b700d18b0fe03fba3cf7 Mon Sep 17 00:00:00 2001
From: jvmncs <jvmncs@gmail.com>
Date: Tue, 3 Jan 2023 10:15:38 -0500
Subject: [PATCH 2/2] bump pytest version to get rid of dependabot alert

---
 requirements-dev.in  |  2 +-
 requirements-dev.txt | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/requirements-dev.in b/requirements-dev.in
index d67a5cb..9c596b8 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -5,5 +5,5 @@ flake8-black
 flake8-isort
 isort
 maturin
-pytest
+pytest>=7.2
 pytest-xdist
diff --git a/requirements-dev.txt b/requirements-dev.txt
index a35db9c..a490c2e 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
 #
 #    make pydep-upgrade
 #
@@ -14,6 +14,8 @@ black==22.6.0
     #   flake8-black
 click==8.1.3
     # via black
+exceptiongroup==1.1.0
+    # via pytest
 execnet==1.9.0
     # via pytest-xdist
 flake8==5.0.4
@@ -45,24 +47,17 @@ platformdirs==2.5.2
     # via black
 pluggy==1.0.0
     # via pytest
-py==1.11.0
-    # via
-    #   pytest
-    #   pytest-forked
 pycodestyle==2.9.1
     # via flake8
 pyflakes==2.5.0
     # via flake8
 pyparsing==3.0.9
     # via packaging
-pytest==7.1.2
+pytest==7.2.0
     # via
     #   -r requirements-dev.in
-    #   pytest-forked
     #   pytest-xdist
-pytest-forked==1.4.0
-    # via pytest-xdist
-pytest-xdist==2.5.0
+pytest-xdist==3.1.0
     # via -r requirements-dev.in
 tomli==2.0.1
     # via