Merge pull request #17 from haverland/typofix

fix typo duplicates
fix upload to pypi
newer python version used

Author: haverland

.github/workflows/python-publish.yml

@@ -10,8 +10,8 @@ name: Upload Python Package
 
 on:
   push:
-#  release:
-#    types: [created]
+  release:
+    types: [created]
 
 permissions:
   contents: read
@@ -24,17 +24,17 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.x'
+        python-version: '3.10'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install build
     - name: Build package
       run: python -m build
     - name: Publish package
-      uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
+      uses: pypa/gh-action-pypi-publish@release/v1
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/release.yml

@@ -36,9 +36,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Setup Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.9.12'
+          python-version: '3.10'
       - name: Install dependencies for ${{ matrix.os }}
         run: |
           python -m pip install --upgrade pip wheel setuptools

collectmeterdigits.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: collectmeterdigits
-Version: 1.0.0
+Version: 1.0.10
 Summary: Reads images from digital meters.
 Home-page: https://github.com/haverland/collectmeterdigits
 Author: Frank Haverland

collectmeterdigits/__main__.py

@@ -16,8 +16,8 @@ def main():
     parser.add_argument('--nodownload', action='store_true',
                         help='Do not download pictures. Only remove duplicates and labeling.')
     parser.add_argument('--startlabel', type=float, default=0.0, help='only images >= startlabel. (default: all)')
-    parser.add_argument('--savedublicates', action='store_true',
-                        help='Save the dublicates in an intermediate subdirectory in raw_images.')
+    parser.add_argument('--saveduplicates', action='store_true',
+                        help='Save the duplicates in an intermediate subdirectory in raw_images.')
     parser.add_argument('--labelfile', default=None,
                         help='file with list of image urls if you want label specific images.')
     parser.add_argument('--model', default=None, help='model file path if a external model should be used')

requirements.txt

@@ -5,6 +5,6 @@ scipy
 scikit-learn
 imagehash
 urllib3
-requests
+requests==2.31.0
 pandas
 tflite-runtime; sys_platform == "linux"

setup.py

@@ -19,7 +19,7 @@
 
 setup(
     name='collectmeterdigits',
-    version='1.0.8',
+    version='1.0.10',
     url='https://github.com/haverland/collectmeterdigits',
     license='Apache 2.0',
     author='Frank Haverland',