From 267c465eb2565a286c4c80aff6423d3e172d5ec9 Mon Sep 17 00:00:00 2001
From: tzutalin <tzu.ta.lin@gmail.com>
Date: Sun, 12 Jun 2022 10:31:38 -0700
Subject: [PATCH] Update .gitignore

---
 .gitignore  | 21 +++++++++++++++++----
 .travis.yml | 30 ------------------------------
 2 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index dc255e2a..63754ecf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 resources/icons/.DS_Store
-
 resources.py
-
-.idea*
 labelImg.egg-info*
 
 *.pyc
@@ -17,6 +14,8 @@ cscope*
 .subvimrc
 .vscode
 *.pkl
+Pipfile
+*.xml
 
 # MacOS System-Generated
 .DS_Store
@@ -27,4 +26,18 @@ cscope*
 ehthumbs.db
 Thumbs.db
 
-Pipfile
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# IDE
+*.DS_Store
+*.iml
+.idea
+.unison*
+.attach*
+tmp.*
diff --git a/.travis.yml b/.travis.yml
index 4c070efc..9d6581d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +1,8 @@
 # vim: set ts=2 et:
 
-# run xvfb with 32-bit color
-# xvfb-run -s '-screen 0 1600x1200x24+32' command_goes_here
-
 jobs:
   include:
 
-    # Python 3 + QT5
-    - os: linux
-      dist: focal
-      language: generic
-      python: "3.6"
-      env:
-        - QT=5
-        - CONDA=4.2.0
-      addons:
-        apt:
-          packages:
-            - cmake
-            - xvfb
-      before_install:
-        # ref: https://repo.anaconda.com/archive/
-        - curl -O https://repo.anaconda.com/archive/Anaconda3-2020.02-Linux-x86_64.sh
-        # ref: http://conda.pydata.org/docs/help/silent.html
-        - /bin/bash Anaconda3-2020.02-Linux-x86_64.sh -b -p $HOME/anaconda3
-        - export PATH="$HOME/anaconda3/bin:$PATH"
-        # ref: http://stackoverflow.com/questions/21637922/how-to-install-pyqt4-in-anaconda
-        - conda create -y -n labelImg-py3qt5 python=3.6
-        - source activate labelImg-py3qt5
-        - conda install -y pyqt=5
-        - conda install -y lxml
-        - make qt5py3
-        - xvfb-run make testpy3
-
     # Pipenv Python 3.7.5 + QT5 - Build .app
     - os: osx
       language: generic