refactor: rename imapbackup38.py to imapbackup.py and drop Python 2.x support

Author: chris2k20

.dockerignore

@@ -2,7 +2,7 @@
 *
 
 # Allow only what the image actually needs
-!imapbackup38.py
+!imapbackup.py
 !Dockerfile
 !.dockerignore
 !LICENSE

Dockerfile

@@ -30,8 +30,8 @@ RUN useradd -r -u 10001 -m app \
 
 # Copy ONLY the requested script
 WORKDIR /app
-COPY imapbackup38.py /app/imapbackup38.py
-RUN chmod +x /app/imapbackup38.py
+COPY imapbackup.py /app/imapbackup.py
+RUN chmod +x /app/imapbackup.py
 
 USER app
 
@@ -41,10 +41,10 @@ VOLUME ["/data"]
 
 # OCI labels
 LABEL org.opencontainers.image.title="imapbackup" \
-      org.opencontainers.image.description="IMAP incremental backup tool packaged as a container. Runs imapbackup38.py only." \
+      org.opencontainers.image.description="IMAP incremental backup tool packaged as a container" \
       org.opencontainers.image.licenses="MIT" \
       org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}" \
       org.opencontainers.image.revision="${GIT_SHA}"
 
 # Use tini as entrypoint and forward args to the script
-ENTRYPOINT ["tini","--","/app/imapbackup38.py"]
+ENTRYPOINT ["tini","--","/app/imapbackup.py"]

README.md

@@ -23,8 +23,9 @@ Somewhat to my surprise it was considered useful by quite a few people throughou
 
 ## Requirements
 
-Python 2.x : `imapbackup.py` should work on Python 2.5 or any other 2.x version without any extra dependencies whatsoever. 
-Python 3.x : `imapbackup38.py` requires python 3.8 and above.
+Python 3.x : `imapbackup.py` requires Python 3.6 and above (tested with 3.8+).
+
+For Python 2.x support, see older versions of this repository.
 
 ## Contributing
 

docs/README.md

@@ -53,7 +53,7 @@ sudo yum install gnupg
 brew install gnupg
 
 # Run backup
-python3 imapbackup38.py \
+python3 imapbackup.py \
   -s imap.example.com \
   -u user@example.com \
   -e

docs/backup-guide.md

@@ -234,7 +234,7 @@ docker run --rm \
 
 ## Kubernetes
 
-Run scheduled backups and ad-hoc restores in Kubernetes using the Docker image. The container entrypoint is `/app/imapbackup38.py`, so you pass flags as container args.
+Run scheduled backups and ad-hoc restores in Kubernetes using the Docker image. The container entrypoint is `/app/imapbackup.py`, so you pass flags as container args.
 
 ### Prerequisites
 
@@ -357,7 +357,7 @@ spec:
               command: ["sh","-c"]
               args:
                 - >-
-                  /app/imapbackup38.py
+                  /app/imapbackup.py
                   -s imap.example.com -u user@example.com -p @/secrets/password -e --nospinner
                   --s3-upload --s3-endpoint=https://s3.example.com --s3-bucket=email-backups
                   --s3-access-key "$S3_ACCESS_KEY" --s3-secret-key "$S3_SECRET_KEY"

docs/gpg-key-import.md

@@ -26,7 +26,7 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # Copy application
-COPY imapbackup38.py /usr/local/bin/imapbackup
+COPY imapbackup.py /usr/local/bin/imapbackup
 RUN chmod +x /usr/local/bin/imapbackup
 
 # Copy and import GPG public key (safe to include in image)
@@ -48,7 +48,7 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # Copy application
-COPY imapbackup38.py /usr/local/bin/imapbackup
+COPY imapbackup.py /usr/local/bin/imapbackup
 RUN chmod +x /usr/local/bin/imapbackup
 
 # Copy public key (will be auto-imported on first run)
@@ -245,7 +245,7 @@ Simple file-based approach:
 gpg --armor --export backup@example.com > ~/keys/backup-public.asc
 
 # Use it in backup
-python3 imapbackup38.py \
+python3 imapbackup.py \
   -s imap.example.com \
   -u user@example.com \
   -e \

docs/python-setup.md

@@ -32,7 +32,7 @@ pip install -r requirements.txt
 sudo apt install gnupg  # Ubuntu/Debian
 
 # Run backup
-python3 imapbackup38.py -s imap.example.com -u user@example.com -e
+python3 imapbackup.py -s imap.example.com -u user@example.com -e
 
 # Deactivate when done
 deactivate
@@ -155,7 +155,7 @@ aws --version
 gpg --version
 
 # Test the script
-python3 imapbackup38.py --help
+python3 imapbackup.py --help
 ```
 
 ## Running Backups
@@ -167,7 +167,7 @@ python3 imapbackup38.py --help
 source venv/bin/activate
 
 # Run backup
-python3 imapbackup38.py \
+python3 imapbackup.py \
   -s imap.example.com \
   -u user@example.com \
   -e
@@ -181,7 +181,7 @@ deactivate
 ```bash
 source venv/bin/activate
 
-python3 imapbackup38.py \
+python3 imapbackup.py \
   -s imap.example.com \
   -u user@example.com \
   -e \
@@ -199,7 +199,7 @@ deactivate
 ```bash
 source venv/bin/activate
 
-python3 imapbackup38.py \
+python3 imapbackup.py \
   -s imap.example.com \
   -u user@example.com \
   -e \
@@ -226,7 +226,7 @@ deactivate
 source /path/to/imapbackup/venv/bin/activate
 
 # Run backup
-python3 /path/to/imapbackup/imapbackup38.py \
+python3 /path/to/imapbackup/imapbackup.py \
   -s imap.example.com \
   -u user@example.com \
   -p @/root/.imap_password \
@@ -267,7 +267,7 @@ After=network.target
 Type=oneshot
 User=backupuser
 WorkingDirectory=/home/backupuser/imapbackup
-ExecStart=/home/backupuser/imapbackup/venv/bin/python3 /home/backupuser/imapbackup/imapbackup38.py -s imap.example.com -u user@example.com -p @/home/backupuser/.imap_password -e -d /backups/email
+ExecStart=/home/backupuser/imapbackup/venv/bin/python3 /home/backupuser/imapbackup/imapbackup.py -s imap.example.com -u user@example.com -p @/home/backupuser/.imap_password -e -d /backups/email
 
 [Install]
 WantedBy=multi-user.target
@@ -435,11 +435,11 @@ chmod -R u+rwX venv/
 ```bash
 # ✓ Good
 source venv/bin/activate
-python3 imapbackup38.py ...
+python3 imapbackup.py ...
 
 # ✗ Bad (pollutes system Python)
 sudo pip install awscli
-python3 imapbackup38.py ...
+python3 imapbackup.py ...
 ```
 
 ### 2. Pin Dependency Versions
@@ -480,7 +480,7 @@ chmod 600 .env
 
 # Load in script
 source .env
-python3 imapbackup38.py -s "$IMAP_SERVER" -u "$IMAP_USER" ...
+python3 imapbackup.py -s "$IMAP_SERVER" -u "$IMAP_USER" ...
 ```
 
 ### 5. Separate Development and Production