switch to requirements.txt

3 files changed, 42 insertions, 8 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7bd9288..2b8023d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,9 +27,9 @@ jobs:
           python-version: "3.9"
       - name: Package for Windows
         run: |
-          pip install pyinstaller pandas xlrd openpyxl Pillow matplotlib sv-ttk ttkwidgets sentry-sdk darkdetect
+          pip install -r requirements.txt
           pyinstaller --add-data "assets;assets" --onefile -c --noconfirm --collect-data sv_ttk main.py
       - uses: actions/upload-artifact@v3
         with:
           name: pyramid-scheme
-          path: dist/
+          path: dist/
\ No newline at end of file
diff --git a/main.py b/main.py
index 8564cbe..c01bab9 100644
--- a/main.py
+++ b/main.py
@@ -75,10 +75,10 @@ def pyramid_list(lst, sort_canadian=True):
                         print(f'Shifting {company_to_add}')
                 if company_to_add is not None:
                     pyramid[-1].pop(company_idx)
-                    pyramid[-2].append(company_to_add)
-    
+                    pyramid[-2].append(company_to_add)               
+
     for _ in range(4):
-        if len(pyramid) > 3:
+        if len(pyramid) > 2:
             if len(pyramid[-1]) < len(pyramid[-2]):
                 pyramid[-3].append(pyramid[-2][-1])
                 pyramid[-2].pop(-1)
@@ -235,13 +235,13 @@ class CompanySelector:
         dividend_color = block_color #(1,50,32)  # Green color
         font_color = (255, 255, 255)  # White color
         normal_block = (3, 37, 126) # Dark Blue  
-        padding = 10  # Padding around blocks
+        padding = 15  # Padding around blocks
         radius = 10 
         logo_padding = 100 # top padding for logo
         pyramid_padding_bottom = 350 # bottom padding for pyramid
         max_companies_in_row = 5
-        primary_font = "./assets/baskerville.ttf"
-        secondary_font = "./assets/gill_sans_bold.ttf"
+        primary_font = "assets/baskerville.ttf"
+        secondary_font = "assets/gill_sans_bold.ttf"
 
         # Group the companies by their scores
         pyramid = {}
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..b459ed8
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,34 @@
+altgraph==0.17.3; python_version >= "3.7" and python_version < "3.12" and sys_platform == "darwin"
+certifi==2023.5.7; python_version >= "3.6"
+contourpy==1.0.7; python_version >= "3.8"
+cycler==0.11.0; python_version >= "3.8"
+darkdetect==0.8.0; python_version >= "3.6"
+et-xmlfile==1.1.0; python_version >= "3.6"
+fonttools==4.39.4; python_version >= "3.8"
+importlib-resources==5.12.0; python_version < "3.10" and python_version >= "3.8"
+kiwisolver==1.4.4; python_version >= "3.8"
+macholib==1.16.2; python_version >= "3.7" and python_version < "3.12" and sys_platform == "darwin"
+matplotlib==3.7.1; python_version >= "3.8"
+numpy==1.24.2
+openpyxl==3.1.2; python_version >= "3.6"
+packaging==23.1; python_version >= "3.8"
+pandas==2.0.0; python_version >= "3.8"
+pefile==2023.2.7; python_version >= "3.7" and python_version < "3.12" and sys_platform == "win32" and python_full_version >= "3.6.0"
+pillow==9.5.0; python_version >= "3.7"
+pyinstaller-hooks-contrib==2023.3; python_version >= "3.7" and python_version < "3.12"
+pyinstaller==5.11.0; python_version >= "3.7" and python_version < "3.12"
+pyparsing==3.0.9; python_full_version >= "3.6.8" and python_version >= "3.8"
+python-dateutil==2.8.2; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.8"
+pytz==2023.3; python_version >= "3.8"
+pywin32-ctypes==0.2.0; python_version >= "3.7" and python_version < "3.12" and sys_platform == "win32"
+sentry-sdk==1.23.1
+setuptools-scm==7.1.0; python_version >= "3.8"
+six==1.16.0; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.8"
+sv-ttk==2.4.5; python_version >= "3.4"
+tomli==2.0.1; python_version < "3.11" and python_version >= "3.8"
+ttkwidgets==0.13.0; python_version >= "3.6"
+typing-extensions==4.5.0; python_version >= "3.8"
+tzdata==2023.3; python_version >= "3.8"
+urllib3==1.26.16; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0")
+xlrd==2.0.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0")
+zipp==3.15.0; python_version < "3.10" and python_version >= "3.8"