Update documentation & CI

- Remove references to submodules as they are no longer used
- Update top level readme with more recent status
- Update travis configuration to use python 3.7 instead of latest for now

.travis.yml

@@ -19,7 +19,8 @@ matrix:
                   python: "3.7"
                   env: "PATH=/c/python37:/c/python37/Scripts:$PATH"
                   before_install:
-                          - choco install python make
+                          - choco install python --version=3.7.6
+                          - choco install make
                           - cp /c/python37/python.exe /c/python37/python3.exe
                   before_script:
                           - pip3 install -r requirements-windows.txt

Makefile

@@ -34,7 +34,6 @@ endif
 
 # Our build scripts are not very "make like" yet and perform their task in a bundle. For now, we
 # use one of each file to act as a representative, a target, of these groups.
-submodules_target = hscommon/__init__.py
 
 packages = hscommon qtlib core qt
 localedirs = $(wildcard locale/*/LC_MESSAGES)
@@ -64,12 +63,7 @@ endif
 	@${PYTHON} -c 'import PyQt5' >/dev/null 2>&1 || \
 		{ echo "PyQt 5.4+ required. Install it and try again. Aborting"; exit 1; }
 
-# Ensure that submodules are initialized
-$(submodules_target) :
-	git submodule init
-	git submodule update
-
-env : | $(submodules_target) reqs
+env : | reqs
 ifndef NO_VENV
 	@echo "Creating our virtualenv"
 	${PYTHON} -m venv env

README.md

@@ -7,37 +7,25 @@ is written in Objective-C and uses Cocoa. On Linux, it's written in Python and u
 
 The Cocoa UI of dupeGuru is hosted in a separate repo: https://github.com/hsoft/dupeguru-cocoa
 
-## Current status: Additional Maintainers Wanted (/ Note on Things in General)
+## Current status
 
-When I started contributing to dupeGuru, it was to help provide an updated Windows build for dupeGuru.  I hoped to contribute more over time and help work through some of the general issues as well.  Since Virgil Dupras left as the lead maintainer, I have not been able to devote enough time to work through as many issues as I had hoped.  Now I am going to be devoting a more consistent amount of time each month to work on dupeGuru, however I will not be able to get to all issues.  Additionally there are a few specific areas where additional help would be appreciated:
+Development has been slow this past year, however very close to getting all the different 4.0.4 releases posted.  Most of the work this past year (2019) has been towards packaging the application and issues related to that.
 
-- OSX maintenance
-  - UI issues (I have no experience with cocoa)
-  - General issues & releases (I lack OSX environments / hardware to develop and test on, looking into doing builds through Travis CI.)
-- Linux maintenance
-  - Packaging (I have not really done much linux packaging yet, although will be spending some time trying to get at least .deb and potentially ppa's updated.)
-
-I am still working to update the new site & update links within the help and the repository to use the new urls.  Additionally, hoping to get a 4.0.4 release out this year for at least Windows and Linux.
-
-Thanks,
-
-Andrew Senetar
+Still looking for additional help especially with regards to:
+- OSX maintenance (reproducing bugs & cocoa version)
+- Linux maintenance (reproducing bugs)
 
 ## Contents of this folder
 
 This folder contains the source for dupeGuru. Its documentation is in `help`, but is also
-[available online][documentation] in its built form. Here's how this source tree is organised:
+[available online][documentation] in its built form. Here's how this source tree is organized:
 
 * core: Contains the core logic code for dupeGuru. It's Python code.
 * qt: UI code for the Qt toolkit. It's written in Python and uses PyQt.
 * images: Images used by the different UI codebases.
 * pkg: Skeleton files required to create different packages
 * help: Help document, written for Sphinx.
-* locale: .po files for localisation.
-
-There are also other sub-folder that comes from external repositories and are part of this repo as
-git submodules:
-
+* locale: .po files for localization.
 * hscommon: A collection of helpers used across HS applications.
 * qtlib: A collection of helpers used across Qt UI codebases of HS applications.
 
@@ -48,7 +36,7 @@ For windows instructions see the [Windows Instructions](Windows.md).
 
 ### Prerequisites
 
-* [Python 3.4+][python]
+* [Python 3.5+][python]
 * PyQt5
 
 ### make

Windows.md

@@ -9,19 +9,17 @@
 
 When installing Visual Studio or the Visual Studio Build Tools with the Windows 10 SDK on versions of Windows below 10 be sure to make sure that the Universal CRT is installed before installing Visual studio as noted in the [Windows 10 SDK Notes][win10sdk] and found at [KB2999226][KB2999226].
 
-After installing python it is recommended to update setuptools before compiling packages.  To update run (example is for python launcher and 3.5):
+After installing python it is recommended to update setuptools before compiling packages.  To update run (example is for python launcher and 3.7):
 
-    $ py -3.5 -m pip install --upgrade setuptools
+    $ py -3.7 -m pip install --upgrade setuptools
 
 More details on setting up python for compiling packages on windows can be found on the [python wiki][pythonWindowsCompilers]
 
 ### With build.py (preferred)
-To build with a different python version 3.5 vs 3.6 or 32 bit vs 64 bit specify that version instead of -3.5 to the `py` command below.  If you want to build additional versions while keeping all virtual environments setup use a different location for each vritual environment.
+To build with a different python version 3.5 vs 3.7 or 32 bit vs 64 bit specify that version instead of -3.7 to the `py` command below.  If you want to build additional versions while keeping all virtual environments setup use a different location for each vritual environment.
 
     $ cd <dupeGuru directory>
-    $ git submodule init
-    $ git submodule update
-    $ py -3.5 -m venv .\env
+    $ py -3.7 -m venv .\env
     $ .\env\Scripts\activate
     $ pip install -r requirements.txt -r requirements-windows.txt
     $ python build.py
@@ -36,10 +34,10 @@ It is possible to build dupeGuru with the makefile on windows using a compatable
 Then the following execution of the makefile should work.  Pass the correct value for PYTHON to the makefile if not on the path as python3.
 
     $ cd <dupeGuru directory>
-    $ make PYTHON='py -3.5'
+    $ make PYTHON='py -3.7'
     $ make run
 
-NOTE: Install PyQt5 & cx-Freeze with requirements-windows.txt into the venv before runing the packaging scripts in the section below.
+NOTE: Install PyQt5 & cx-Freeze with requirements-windows.txt into the venv before running the packaging scripts in the section below.
 
 ### Generate Windows Installer Packages
 You need to use the respective x86 or x64 version of python to build the 32 bit and 64 bit versions.  The build scripts will automatically detect the python architecture for you. When using build.py make sure the resulting python works before continuing to package.py.  NOTE: package.py looks for the 'makensis' executable in the default location for a 64 bit windows system.  Run the following in the respective virtual environment.