From 59e3b2e52be03df335af009dc0f01061025c0a7a Mon Sep 17 00:00:00 2001 From: Frank Haverland Date: Thu, 26 Sep 2024 11:08:10 +0200 Subject: [PATCH 1/7] fix typo duplicates --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0f41be3..6a9d702 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,6 @@ scipy scikit-learn imagehash urllib3 -requests +requests==2.31.0 pandas tflite-runtime; sys_platform == "linux" From 98c4ecf87a512225fc7e4005aebcbda65b07272b Mon Sep 17 00:00:00 2001 From: Frank Haverland Date: Thu, 26 Sep 2024 11:11:10 +0200 Subject: [PATCH 2/7] update python-publish --- .github/workflows/python-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 22ab874..00f180d 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -34,7 +34,7 @@ jobs: - 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 }} From b7cdf4f6d212f3facf4850edb08995146a273cbb Mon Sep 17 00:00:00 2001 From: Frank Haverland Date: Thu, 26 Sep 2024 11:15:43 +0200 Subject: [PATCH 3/7] python-setup version raised --- .github/workflows/python-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 00f180d..06ef095 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -24,9 +24,9 @@ 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 From 3e1b8022b2888f70f47ff65ba9e6728ac744e919 Mon Sep 17 00:00:00 2001 From: Frank Haverland Date: Thu, 26 Sep 2024 11:37:15 +0200 Subject: [PATCH 4/7] python 3.10, new version 1.0.7 --- .github/workflows/release.yml | 4 ++-- collectmeterdigits.egg-info/PKG-INFO | 2 +- collectmeterdigits/__main__.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7e525ae..a4fa05d 100644 --- a/.github/workflows/release.yml +++ b/.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 diff --git a/collectmeterdigits.egg-info/PKG-INFO b/collectmeterdigits.egg-info/PKG-INFO index 48150fd..9d26788 100644 --- a/collectmeterdigits.egg-info/PKG-INFO +++ b/collectmeterdigits.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: collectmeterdigits -Version: 1.0.0 +Version: 1.0.7 Summary: Reads images from digital meters. Home-page: https://github.com/haverland/collectmeterdigits Author: Frank Haverland diff --git a/collectmeterdigits/__main__.py b/collectmeterdigits/__main__.py index a8bc587..8f051eb 100644 --- a/collectmeterdigits/__main__.py +++ b/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') From 34e005ee81856ef2834e863b070c434314ac829e Mon Sep 17 00:00:00 2001 From: Frank Haverland Date: Thu, 26 Sep 2024 11:42:41 +0200 Subject: [PATCH 5/7] version 1.0.9 --- collectmeterdigits.egg-info/PKG-INFO | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/collectmeterdigits.egg-info/PKG-INFO b/collectmeterdigits.egg-info/PKG-INFO index 9d26788..e5b595f 100644 --- a/collectmeterdigits.egg-info/PKG-INFO +++ b/collectmeterdigits.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: collectmeterdigits -Version: 1.0.7 +Version: 1.0.9 Summary: Reads images from digital meters. Home-page: https://github.com/haverland/collectmeterdigits Author: Frank Haverland diff --git a/setup.py b/setup.py index bac9d29..bb044a2 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ setup( name='collectmeterdigits', - version='1.0.8', + version='1.0.9', url='https://github.com/haverland/collectmeterdigits', license='Apache 2.0', author='Frank Haverland', From 6c40fadb0e14c0da30dd41c45de1424c0d38eb5b Mon Sep 17 00:00:00 2001 From: Frank Haverland Date: Thu, 26 Sep 2024 11:44:24 +0200 Subject: [PATCH 6/7] version 1.0.10 --- .github/workflows/python-publish.yml | 4 ++-- collectmeterdigits.egg-info/PKG-INFO | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 06ef095..f695ef5 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -10,8 +10,8 @@ name: Upload Python Package on: push: -# release: -# types: [created] + release: + types: [created] permissions: contents: read diff --git a/collectmeterdigits.egg-info/PKG-INFO b/collectmeterdigits.egg-info/PKG-INFO index e5b595f..b661705 100644 --- a/collectmeterdigits.egg-info/PKG-INFO +++ b/collectmeterdigits.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: collectmeterdigits -Version: 1.0.9 +Version: 1.0.10 Summary: Reads images from digital meters. Home-page: https://github.com/haverland/collectmeterdigits Author: Frank Haverland From 1a80fdf1732cc31ab0835d53d43eccb8ffddcfa4 Mon Sep 17 00:00:00 2001 From: Frank Haverland Date: Thu, 26 Sep 2024 11:44:49 +0200 Subject: [PATCH 7/7] version 1.0.10 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bb044a2..6d0f28b 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ setup( name='collectmeterdigits', - version='1.0.9', + version='1.0.10', url='https://github.com/haverland/collectmeterdigits', license='Apache 2.0', author='Frank Haverland',