Merge branch '2.2.1' into 'master'

2.2.1

See merge request Cyb3r-Jak3/metastalk!16

.gitlab-ci.yml

@@ -36,12 +36,10 @@ Coverage:
     - metastalk_exports/*
   before_script:
     - curl --silent -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter; chmod +x ./cc-test-reporter; ./cc-test-reporter before-build
-    - pip install -U pip coverage -r requirements/default.txt --quiet
+    - pip install -U pip coverage --quiet
   script:
     - pip install .
     - coverage run --source=./MetaStalk/ --append -m unittest -vv
-    - pip install .[heic]
-    - coverage run --source=./MetaStalk/ --append -m unittest -vv
   after_script:
     - coverage report
     - coverage html
@@ -55,7 +53,7 @@ Coverage:
 .lint:
   stage: lint
   before_script:
-    - pip install -U pip tox
+    - pip install -U pip tox --quiet
 
 python-3.6-lint:
   extends: ".lint"
@@ -93,7 +91,7 @@ python-pypy-lint:
     - pip install -U setuptools twine --quiet
   script:
     - python setup.py egg_info
-    - python setup.py sdist bdist_wheel bdist
+    - python setup.py sdist bdist_wheel
     - python -m twine check dist/*
 
 python-3.6-build:
@@ -120,7 +118,6 @@ python-3.8-build:
     - metastalk ./ExamplePhotos/Panasonic_DMC-FZ30.jpg ./ExamplePhotos/DSCN0010.jpg -t -d
     - pip uninstall metastalk -y; pip install .[dev]
     - pip uninstall metastalk -y; pip install .[image]
-    - pip uninstall metastalk -y; pip install .[heic]
     - pip uninstall metastalk -y; pip install .[full]
     - pip uninstall metastalk -y; pip install .[all]
 

CHANGELOG.md

@@ -2,6 +2,23 @@
 
 <!-- markdownlint-disable MD024 -->
 
+## [v2.2.1] - UNRELEASED
+
+## Added
+
+- ExifReader requirement.
+- .tiff photos for testing
+
+## Changed
+
+- Changed so exif files also use ExifReader without the need for pyheif.
+
+## Removed
+
+- Exifread and pyheif requirements.
+- Removed heic extra.
+- Pipfile and Pipfile.lock
+
 ## [v2.2.0](https://gitlab.com/Cyb3r-Jak3/metastalk/-/releases/v2.2.0) - 2020-05-08
 
 ## Added

MetaStalk/__init__.py

@@ -2,5 +2,5 @@
 ---
 MetaStalk is a program that parse image metadata and creates charts from it.
 """
-__version__ = "v2.2.post1"
+__version__ = "2.2.1"
 __author__ = "Cyb3r Jak3"

MetaStalk/main.py

@@ -7,7 +7,7 @@
 import os
 import logging
 import timeit
-import exifread
+import exifreader
 import MetaStalk.utils as utils
 import MetaStalk.modules as modules
 
@@ -23,7 +23,6 @@ def __init__(self):
         self.t_start = timeit.default_timer()
         self.valid, self.invalid = [], []
         self.plots = {}
-        self.heic = utils.check_heic()
 
     def run(self, args):
         """Run
@@ -79,12 +78,9 @@ def file_search(self, parse_file: str):
         Arguments
             parse_files {str} -- Name of the file to parse.
         """
-        if parse_file.lower().endswith(("heic", "heif")) and self.heic:
-            tags = utils.parse_heic(parse_file)
-        else:
-            with open(parse_file, "rb") as f:
-                tags = exifread.process_file(f)
-                f.close()
+        with open(parse_file, "rb") as f:
+            tags = exifreader.process_file(f)
+            f.close()
         if tags:
             tags["item"] = parse_file
             self.valid.append(tags)

MetaStalk/utils/__init__.py

@@ -7,11 +7,8 @@
 from .logger import make_logger
 from .export import export
 from .parse import gps_parse
-from .heic_parse import parse_heic, check_heic
 
 __all__ = ["graph",
            "make_logger",
            "export",
-           "gps_parse",
-           "parse_heic",
-           "check_heic"]
+           "gps_parse"]