From 6ebfb45a187a4d1c48167f1d4b7497d37f2d5ea1 Mon Sep 17 00:00:00 2001 From: GurdevSingh855 Date: Wed, 26 Mar 2025 11:12:26 +0530 Subject: [PATCH 1/9] Added contribution with project improvement idea --- contribution.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 contribution.txt diff --git a/contribution.txt b/contribution.txt new file mode 100644 index 0000000..a1ac44a --- /dev/null +++ b/contribution.txt @@ -0,0 +1 @@ +Gurdev Singh: Add dark mode to the project. From 5737367b9a84f1ccd1f57a3041423a2e7ced0495 Mon Sep 17 00:00:00 2001 From: GurdevSingh855 Date: Wed, 26 Mar 2025 11:40:07 +0530 Subject: [PATCH 2/9] Added .gitignore to ignore log files and temp directory --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..328214b --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.log +temp/ From df39e0bdfb00dba3e3d3ecacb050eab1d84ccedc Mon Sep 17 00:00:00 2001 From: GurdevSingh855 Date: Wed, 26 Mar 2025 12:13:48 +0530 Subject: [PATCH 3/9] Added README with project title, description, and steps to run the project --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 944a600..649ed8c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ + # πŸ‘£ **Awesome python projects** ### 🧐 A collection of super-cool Python projects for starters!! ✨ +With easy coding and syntax ![Author](https://img.shields.io/badge/author-garimasingh128-orange) ![Author](https://img.shields.io/badge/author-mrinal41298-orange) From 6f70835883d4edee288441c52483bf52988a28b6 Mon Sep 17 00:00:00 2001 From: GurdevSingh855 Date: Wed, 26 Mar 2025 12:35:32 +0530 Subject: [PATCH 4/9] Added note in conflict-demo branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 649ed8c..7b79f3d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # πŸ‘£ **Awesome python projects** -### 🧐 A collection of super-cool Python projects for starters!! ✨ +### 🧐 A collection of super-cool Python projects for beginners With easy coding and syntax ![Author](https://img.shields.io/badge/author-garimasingh128-orange) From 4e15c3707ebe5902339f6e9ab7b428179396ba45 Mon Sep 17 00:00:00 2001 From: GurdevSingh855 Date: Wed, 26 Mar 2025 12:37:35 +0530 Subject: [PATCH 5/9] Added note in master branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 649ed8c..e299647 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # πŸ‘£ **Awesome python projects** -### 🧐 A collection of super-cool Python projects for starters!! ✨ +### 🧐 A collection of super-cool Python projects for snew comers✨ With easy coding and syntax ![Author](https://img.shields.io/badge/author-garimasingh128-orange) From bf5c37575b4a3f39a7816d2f69b14d22c9924dc3 Mon Sep 17 00:00:00 2001 From: GurdevSingh855 Date: Wed, 26 Mar 2025 12:55:46 +0530 Subject: [PATCH 6/9] Added note In conflict-demo branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b79f3d..7bf6afb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # πŸ‘£ **Awesome python projects** -### 🧐 A collection of super-cool Python projects for beginners +### 🧐 A collection of super-cool Python projects for starters With easy coding and syntax ![Author](https://img.shields.io/badge/author-garimasingh128-orange) From 2a5b3a36405736ec58061312ee84a328d7677766 Mon Sep 17 00:00:00 2001 From: GurdevSingh855 Date: Wed, 26 Mar 2025 12:57:24 +0530 Subject: [PATCH 7/9] Added note in main branch --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 65e998e..c298f7c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # πŸ‘£ **Awesome python projects** -### 🧐 A collection of super-cool Python projects for beginners ->>>>>>> conflict-demo +### 🧐 A collection of super-cool Python projects for enthusiasts> +>>>>>> conflict-demo With easy coding and syntax ![Author](https://img.shields.io/badge/author-garimasingh128-orange) From eac557bc50f4b5741a7416f8121ea95741327fd8 Mon Sep 17 00:00:00 2001 From: GurdevSingh855 Date: Mon, 5 May 2025 20:13:48 +0530 Subject: [PATCH 8/9] Create ci.yml --- .github/workflows/ci.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..5311734 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,26 @@ +name: Python Application + +on: [push, pull_request] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.9' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + + - name: Run tests + run: | + echo "Running tests..." + pytest || echo From 6e0e2be83e3314a4c3c75e77e78d234d76818b4a Mon Sep 17 00:00:00 2001 From: GurdevSingh855 Date: Mon, 5 May 2025 20:18:55 +0530 Subject: [PATCH 9/9] Made a small change to trigger GitHub Actions --- main.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 main.py diff --git a/main.py b/main.py new file mode 100644 index 0000000..3c82425 --- /dev/null +++ b/main.py @@ -0,0 +1 @@ +# Triggering workflow again