From 2345c81ecb040259254d9074126242bae599430b Mon Sep 17 00:00:00 2001 From: carnesa Date: Mon, 15 Jun 2026 20:37:23 +0000 Subject: [PATCH 1/4] Added name to Contributors page. --- app/config/default.yml | 2 ++ requirements.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/config/default.yml b/app/config/default.yml index e4b9b14e2..f28197da4 100644 --- a/app/config/default.yml +++ b/app/config/default.yml @@ -181,3 +181,5 @@ contributors: role: "Software Engineer" - name: "Alina Petrosyants" role: "Software Engineer" + - name: "Andrew Carnes" + role: "Software Engineer" \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 39044c925..aeb9c89fd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ attrs==25.3.0 blessings==1.7 blinker==1.9.0 certifi==2025.8.3 -cffi==1.17.1 +cffi chardet==5.2.0 charset-normalizer==3.4.2 click==8.2.1 From 612f59fd2425fb3fc7dccb730e78a2fee516050a Mon Sep 17 00:00:00 2001 From: carnesa Date: Mon, 15 Jun 2026 21:14:49 +0000 Subject: [PATCH 2/4] Updated the cffi in the requirements file. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index aeb9c89fd..39044c925 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ attrs==25.3.0 blessings==1.7 blinker==1.9.0 certifi==2025.8.3 -cffi +cffi==1.17.1 chardet==5.2.0 charset-normalizer==3.4.2 click==8.2.1 From 867ec650f7339c34bbd2d9c2bff693d01b95c792 Mon Sep 17 00:00:00 2001 From: carnesa Date: Wed, 17 Jun 2026 11:36:17 -0400 Subject: [PATCH 3/4] Rebased commit to account for new contributor additions. --- app/config/default.yml | 4 ++++ requirements.txt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/config/default.yml b/app/config/default.yml index c9789c8a6..af41abc47 100644 --- a/app/config/default.yml +++ b/app/config/default.yml @@ -181,5 +181,9 @@ contributors: role: "Software Engineer" - name: "Alina Petrosyants" role: "Software Engineer" +<<<<<<< HEAD - name: "Denys Zhytkov" +======= + - name: "Andrew Carnes" +>>>>>>> 2345c81ec (Added name to Contributors page.) role: "Software Engineer" \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 92f155db0..e6f18936c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,11 @@ attrs==25.3.0 blessings==1.7 blinker==1.9.0 certifi==2025.8.3 +<<<<<<< HEAD cffi +======= +cffi +>>>>>>> 2345c81ec (Added name to Contributors page.) chardet==5.2.0 charset-normalizer==3.4.2 click==8.2.1 From 5cd43d6510bb52cadc987d458e5c75be6185c5e1 Mon Sep 17 00:00:00 2001 From: carnesa Date: Wed, 17 Jun 2026 11:43:57 -0400 Subject: [PATCH 4/4] Adjusted default.yml code to account for other users adding their names and fixed requirements.txt --- app/config/default.yml | 4 +--- requirements.txt | 6 +----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/config/default.yml b/app/config/default.yml index af41abc47..341ed47ef 100644 --- a/app/config/default.yml +++ b/app/config/default.yml @@ -181,9 +181,7 @@ contributors: role: "Software Engineer" - name: "Alina Petrosyants" role: "Software Engineer" -<<<<<<< HEAD - name: "Denys Zhytkov" -======= + role: "Software Engineer" - name: "Andrew Carnes" ->>>>>>> 2345c81ec (Added name to Contributors page.) role: "Software Engineer" \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index e6f18936c..39044c925 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,11 +4,7 @@ attrs==25.3.0 blessings==1.7 blinker==1.9.0 certifi==2025.8.3 -<<<<<<< HEAD -cffi -======= -cffi ->>>>>>> 2345c81ec (Added name to Contributors page.) +cffi==1.17.1 chardet==5.2.0 charset-normalizer==3.4.2 click==8.2.1