fix travis regex

1.2.0+2

.gitignore

@@ -3,4 +3,10 @@
 /dist
 *.pyc
 /.vscode
-venv
+venv
+*.o
+*.a
+*.so
+build/
+ctversion.py
+.eggs

.travis.yml

@@ -0,0 +1,42 @@
+language: python
+branches:
+  only:
+    - develop
+    - /^\d+\.\d+\.\d+$/
+env:
+  global:
+    - PYTHON=python
+    - PIP=pip
+    - SETUPTOOLS_SCM_PRETEND_VERSION=$TRAVIS_TAG
+    - MAKE=make
+matrix:
+  include:
+    - os: linux
+    - os: osx
+      language: generic
+      osx_image: xcode8.3
+      env: PYTHON=python3 PIP=pip3 MACOSX_DEPLOYMENT_TARGET=10.11
+    - os: windows
+      language: bash
+      env: PATH=/C/Python37:/C/Python37/Scripts:$PATH MAKE=mingw32-make
+before_install:
+  - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -y python mingw zip; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew upgrade python3 ; fi
+install:
+  - $PIP install --upgrade setuptools
+  - $PIP install -r requirements.txt
+script:
+  - $MAKE dist
+
+deploy:
+  name: $TRAVIS_TAG
+  body: Released ComicTagger $TRAVIS_TAG
+  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/*.zip
+  draft: true
+  on:    
+    tags: true

Makefile

@@ -1,11 +1,14 @@
-VERSION_STR := $(shell python -c 'import comictaggerlib.ctversion; print( comictaggerlib.ctversion.version)')
+PIP ?= pip
+VERSION_STR := $(shell python setup.py --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)
@@ -28,6 +31,7 @@ clean:
 	rm -f unrar/libunrar.so unrar/libunrar.a unrar/unrar
 	rm -f comictaggerlib/libunrar.so
 	rm -rf comictaggerlib/ui/__pycache__
+	rm comitaggerlib/ctversion.py
 
 pydist:
 	make clean
@@ -51,5 +55,6 @@ else
 endif
 
 dist: unrar
+	$(PIP) install .
 	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

@@ -1,6 +0,0 @@
-version: 1.0.{build}
-build_script:
-- cmd: powershell -exec bypass -File windows\fullbuild.ps1
-artifacts:
-- path: dist\*.exe
-  name: ComicTagger

comictagger.spec

@@ -9,10 +9,12 @@ binaries = [
 ]
 
 if platform.system() == "Windows":
+    from site import getsitepackages
+    sitepackages = getsitepackages()[1]
     # add ssl qt libraries not discovered automatically
     binaries.extend([
-        ('./venv/Lib/site-packages/PyQt5/Qt/bin/libeay32.dll', './PyQt5/Qt/bin'),
-        ('./venv/Lib/site-packages/PyQt5/Qt/bin/ssleay32.dll', './PyQt5/Qt/bin')
+        ('%s/PyQt5/Qt/bin/libeay32.dll' % sitepackages, './PyQt5/Qt/bin'),
+        ('%s/PyQt5/Qt/bin/ssleay32.dll' % sitepackages, './PyQt5/Qt/bin')
     ])
 
 a = Analysis(['comictagger.py'],

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 +0,0 @@
-# This file should contain only these comments, and the line below.
-# Used by packaging makefiles and app
-version = "1.1.31-rc1"

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 +0,0 @@
-1.1.16-beta-rc

mac/Makefile

@@ -5,7 +5,7 @@ TAGGER_BASE ?= ../
 TAGGER_SRC := $(TAGGER_BASE)/comictaggerlib
 
 APP_NAME := ComicTagger
-VERSION_STR := $(shell grep version $(TAGGER_SRC)/ctversion.py| cut -d= -f2 | sed 's/\"//g')
+VERSION_STR := $(shell python setup.py --version)
 
 MAC_BASE := $(TAGGER_BASE)/mac
 DIST_DIR := $(MAC_BASE)/dist

requirements.txt

@@ -5,4 +5,4 @@ natsort==3.5.2
 PyPDF2==1.24
 pillow>=4.3.0
 PyQt5>=5.10.1
-git+https://github.com/pyinstaller/pyinstaller@develop
+pyinstaller>=3.5

setup.py

@@ -23,7 +23,6 @@ import sys
 import shutil
 import platform
 import tempfile
-import comictaggerlib.ctversion
 
 python_requires='>=3',
 
@@ -193,18 +192,22 @@ setup(name="comictagger",
         'build_py': BuildPyCommand,
         'install': customInstall,
         },
-      version=comictaggerlib.ctversion.version,
       description="A cross-platform GUI/CLI app for writing metadata to comic archives",
       author="ComicTagger team",
       author_email="comictagger@gmail.com",
-      url="https://github.com/davide-romanini/comictagger",
-      download_url="https://pypi.python.org/packages/source/c/comictagger/comictagger-{0}.zip".format(comictaggerlib.ctversion.version),
+      url="https://github.com/davide-romanini/comictagger",      
       packages=["comictaggerlib", "comicapi"],
       package_data={
           'comictaggerlib': ['ui/*', 'graphics/*', '*.so'],
       },
       entry_points=dict(console_scripts=['comictagger=comictaggerlib.main:ctmain']),
       data_files=platform_data_files,
+      setup_requires=[
+        "setuptools_scm"
+      ],
+      use_scm_version={
+          'write_to': 'comictaggerlib/ctversion.py'
+      },
       classifiers=[
             "Development Status :: 4 - Beta",
             "Environment :: Console",

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,8 +0,0 @@
-# Script to be run inside appveyor for a full build
-choco install -y mingw
-refreshenv
-$env:PATH="C:\Python36-x64;$env:path"
-python -m venv venv
-.\venv\Scripts\Activate.ps1
-pip install -r .\requirements.txt
-mingw32-make dist

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