Merge pull request #66 from gisce/copilot/fix-177beaab-36d0-4722-93b6-e4068b93ef41

Adapt CI to use Docker container for Python 2.7 testing, add Python 3.11 support, and fix MIME type detection

Author: polsala

.github/workflows/python-app.yml

@@ -10,38 +10,33 @@ on:
     branches: [ "master" ]
 
 jobs:
-  run-tests:
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [ "2.7", "3.11" ]
-
+  test-python3:
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3
-      if: matrix.python-version == '3.11'
+    - name: Set up Python 3.11
       uses: actions/setup-python@v4
       with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Install Python 2
-      if: matrix.python-version == '2.7'
+        python-version: "3.11"
+    - name: Install dependencies
       run: |
-        sudo apt update
-        sudo apt install python2 python-pip
-        sudo update-alternatives --install /usr/bin/python python /usr/bin/python2 1
-        sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 2
-        printf '1\n' | sudo update-alternatives --config python
-        cd /usr/bin
-        sudo ln -s /usr/bin/pip2 ./pip
+        python -m pip install --upgrade pip
+        pip install -r requirements-dev.txt
+        pip install -e .
+    - name: Tests
+      run: |
+        mamba
 
+  test-python2:
+    runs-on: ubuntu-latest
+    container: python:2.7-slim
+    steps:
+    - uses: actions/checkout@v3
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements-dev.txt
         pip install -e .
-
     - name: Tests
       run: |
-       mamba
+        mamba

qreu/email.py

@@ -388,6 +388,21 @@ def add_attachment(self, input_buff, attname=False):
 
         # Guess MIME type
         filetype = mimetypes.guess_type(filename)[0]
+        
+        # Ensure common Microsoft Office MIME types are available (especially for Python 2.7)
+        if not filetype:
+            office_extensions = {
+                '.docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                '.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                '.pptx': 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+                '.doc': 'application/msword',
+                '.xls': 'application/vnd.ms-excel',
+                '.ppt': 'application/vnd.ms-powerpoint'
+            }
+            file_ext = filename.lower().split('.')[-1] if '.' in filename else ''
+            if '.' + file_ext in office_extensions:
+                filetype = office_extensions['.' + file_ext]
+        
         maintype, subtype = 'application', 'octet-stream'
         if filetype:
             maintype, subtype = filetype.split('/')

setup.py

@@ -19,6 +19,7 @@
     classifiers=[
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.11',
         'Topic :: Software Development :: Libraries',
         'Topic :: Communications :: Email'
     ]