Merge branch 'release/1.2.0+2'

1.2.0+1

.travis.yml

@@ -0,0 +1,23 @@
+language: generic
+os: osx
+osx_image: xcode8.3
+install:
+- brew upgrade python3
+- pip3 install --upgrade setuptools
+- pip3 install -r requirements.txt
+script:
+- make dist
+- ls -l dist
+deploy:
+  name: $TRAVIS_TAG
+  body: New macOS Release
+  provider: releases
+  skip_cleanup: true
+  api_key:
+    secure: RgohcOJOfLhXXT12bMWaLwOqhe+ClSCYXjYuUJuWK4/E1fdd1xu1ebdQU+MI/R8cZ0Efz3sr2n3NkO/Aa8gN68xEfuF7RVRMm64P9oPrfZgGdsD6H43rU/6kN8bgaDRmCYpLTfXaJ+/gq0x1QDkhWJuceF2BYEGGvL0BvS/TUsLyjVxs8ujTplLyguXHNEv4/7Yz7SBNZZmUHjBuq/y+l8ds3ra9rSgAVAN1tMXoFKJPv+SNNkpTo5WUNMPzBnN041F1rzqHwYDLog2V7Krp9JkXzheRFdAr51/tJBYzEd8AtYVdYvaIvoO6A4PiTZ7MpsmcZZPAWqLQU00UTm/PhT/LVR+7+f8lOBG07RgNNHB+edjDRz3TAuqyuZl9wURWTZKTPuO49TkZMz7Wm0DRNZHvBm1IXLeSG7Tll2YL1+WpZNZg+Dhro2J1QD3vxDXafhMdTCB4z0q5aKpG93IT0p6oXOO0oEGOPZYbA2c5R3SXWSyqd1E1gdhbVjIZr59h++TEf1zz07tvWHqPuAF/Ly/j+dIcY2wj0EzRWaSASWgUpTnMljAkHtWhqDw4GXGDRkRUWRJl1d0/JyVqCeIdRzDQNl8/q7BcO3F1zqr1PgnYdz0lfwWxL1/ekw2vHOJE/GOdkyvX0aJrnaOV338mjJbfGHYv4ESc9ow1kdtIbiU=
+  file_glob: true  
+  file: dist/ComicTagger*.zip
+  draft: true
+  on:
+    branch: master
+    tags: true

Makefile

@@ -1,11 +1,13 @@
 VERSION_STR := $(shell python -c 'import comictaggerlib.ctversion; print( comictaggerlib.ctversion.version)')
 
 ifeq ($(OS),Windows_NT)
+	OS_VERSION=win-$(PROCESSOR_ARCHITECTURE)
 	APP_NAME=comictagger.exe
-	FINAL_NAME=ComicTagger-$(VERSION_STR).exe
+	FINAL_NAME=ComicTagger-$(VERSION_STR)-$(OS_VERSION).exe
 else ifeq ($(shell uname -s),Darwin)
+	OS_VERSION=osx-$(shell defaults read loginwindow SystemVersionStampAsString)-$(shell uname -m)
 	APP_NAME=ComicTagger.app
-	FINAL_NAME=ComicTagger-$(VERSION_STR).app
+	FINAL_NAME=ComicTagger-$(VERSION_STR)-$(OS_VERSION).app
 else
 	APP_NAME=comictagger
 	FINAL_NAME=ComicTagger-$(VERSION_STR)
@@ -52,4 +54,4 @@ endif
 
 dist: unrar
 	pyinstaller -y comictagger.spec
-	mv dist/$(APP_NAME) dist/$(FINAL_NAME)
+	cd dist && zip -r $(FINAL_NAME).zip $(APP_NAME)

README.md

@@ -1,6 +1,18 @@
-A fork from the primary dev branch at https://github.com/davide-romanini/comictagger
 
-Changes:
+ComicTagger is a multi-platform app for writing metadata to digital comics, written in Python and PyQt.
+
+Features:
+
+* Runs on Mac OSX, Microsoft Windows, and Linux systems
+* Communicates with an online database (Comic Vine) for acquiring metadata
+* Uses image processing to automatically match a given archive with the correct issue data
+* Batch processing in the GUI for tagging hundreds or more comics at a time
+* Reads and writes multiple tagging schemes (ComicBookLover and ComicRack).
+* Reads and writes RAR and Zip archives (external tools needed for writing RAR)
+* Can run without PyQt5 installed 
+
+
+Recent changes:
  - Ported to Python 3
  - Ported to PyQt5
  - Added more application and GUI awareness of the unrar library, and removed references to the old scheme that used the unrar executable.  

appveyor.yml

@@ -2,5 +2,16 @@ version: 1.0.{build}
 build_script:
 - cmd: powershell -exec bypass -File windows\fullbuild.ps1
 artifacts:
-- path: dist\*.exe
-  name: ComicTagger
+- path: dist\*.zip
+  name: ComicTagger
+deploy:
+  description: New Windows Release
+  provider: GitHub
+  auth_token:
+    secure: GftVXNVTfnfWxlCIWNsufQjgrLqGPbrhK7bddzZ+6onYbbx6vEKWku0QMZjcxq/D
+  draft: true
+  prerelease: false
+  artifact: ComicTagger
+  on:
+    APPVEYOR_REPO_TAG: true
+    

comictaggerlib/comicvinetalker.py

@@ -105,7 +105,7 @@ class ComicVineTalker(QObject):
         self.log_func = None
 
         # always use a tls context for urlopen
-        self.ssl = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
+        self.ssl = ssl.SSLContext(ssl.PROTOCOL_TLS)
 
     def setLogFunc(self, log_func):
         self.log_func = log_func

comictaggerlib/ctversion.py

@@ -1,3 +1,3 @@
 # This file should contain only these comments, and the line below.
 # Used by packaging makefiles and app
-version = "1.1.31-rc1"
+version = "1.2.0+2"

comictaggerlib/imagefetcher.py

@@ -67,7 +67,7 @@ class ImageFetcher(QObject):
             self.create_image_db()
 
         # always use a tls context for urlopen
-        self.ssl = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
+        self.ssl = ssl.SSLContext(ssl.PROTOCOL_TLS)
 
     def clearCache(self):
         os.unlink(self.db_file)

current_version.txt

@@ -1 +1 @@
-1.1.16-beta-rc
+1.2.0+2

windows/deps.ps1

@@ -1,5 +0,0 @@
-# to be run inside comictagger folder
-# installs conda and pip dependencies
-activate comictagger
-conda install -y pyqt=4
-pip install -r .\requirements.txt

windows/env.ps1

@@ -1,3 +0,0 @@
-$env:PATH+=";C:\ProgramData\Miniconda2\Scripts;C:\ProgramData\Miniconda2"
-$env:PATH+=";C:\tools\mingw64\bin"
-Set-Alias make mingw32-make.exe -scope Global

windows/fullbuild.ps1

@@ -1,5 +1,5 @@
 # Script to be run inside appveyor for a full build
-choco install -y mingw
+choco install -y mingw zip
 refreshenv
 $env:PATH="C:\Python36-x64;$env:path"
 python -m venv venv

windows/provision.ps1

@@ -1,11 +0,0 @@
-# This script should be run into an admin PowerShell to install all required
-# packages needed for building comictagger on windows
-#
-# NOTE: this script has not been fully tested on a fresh windows VM.
-#
-# install chocolatey
-Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-choco install -y git mingw miniconda
-$env:PATH+=";C:\ProgramData\Miniconda2\Scripts;C:\ProgramData\Miniconda2"
-$env:PATH+=";C:\tools\mingw64\bin"
-conda create -y --name comictagger python=2