From 9b5a394aba09755bf779e4d61344a754c0795d6b Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 22:33:59 -0400 Subject: [PATCH 01/17] Update util_grabdata.py updated the cthulu link to Azure link --- utool/util_grabdata.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/utool/util_grabdata.py b/utool/util_grabdata.py index 41b2e98a..bdbcb583 100755 --- a/utool/util_grabdata.py +++ b/utool/util_grabdata.py @@ -613,20 +613,20 @@ def split_archive_ext(path): TESTIMG_URL_DICT = { - 'grace.jpg': 'https://cthulhu.dyn.wildme.io/public/testimgs/rgQyu7r.jpg', - 'jeff.png': 'https://cthulhu.dyn.wildme.io/public/testimgs/l00rECD.png', - 'ada2.jpg': 'https://cthulhu.dyn.wildme.io/public/testimgs/zHOpTCb.jpg', - 'ada.jpg': 'https://cthulhu.dyn.wildme.io/public/testimgs/iXNf4Me.jpg', - 'lena.png': 'https://cthulhu.dyn.wildme.io/public/testimgs/JGrqMnV.png', # depricate lena - 'astro.png': 'https://cthulhu.dyn.wildme.io/public/testimgs/KXhKM72.png', # Use instead of lena - 'carl.jpg': 'https://cthulhu.dyn.wildme.io/public/testimgs/flTHWFD.jpg', - 'easy1.png': 'https://cthulhu.dyn.wildme.io/public/testimgs/Qqd0VNq.png', - 'easy2.png': 'https://cthulhu.dyn.wildme.io/public/testimgs/BDP8MIu.png', - 'easy3.png': 'https://cthulhu.dyn.wildme.io/public/testimgs/zBcm5mS.png', - 'hard3.png': 'https://cthulhu.dyn.wildme.io/public/testimgs/ST91yBf.png', - 'zebra.png': 'https://cthulhu.dyn.wildme.io/public/testimgs/58hbGcd.png', - 'star.png': 'https://cthulhu.dyn.wildme.io/public/testimgs/d2FHuIU.png', - 'patsy.jpg': 'https://cthulhu.dyn.wildme.io/public/testimgs/C1lNRfT.jpg', + 'grace.jpg': 'https://wildbookiarepository.azureedge.net/testimgs/rgQyu7r.jpg', + 'jeff.png': 'https://wildbookiarepository.azureedge.net/testimgs/l00rECD.png', + 'ada2.jpg': 'https://wildbookiarepository.azureedge.net/testimgs/zHOpTCb.jpg', + 'ada.jpg': 'https://wildbookiarepository.azureedge.net/testimgs/iXNf4Me.jpg', + 'lena.png': 'https://wildbookiarepository.azureedge.net/testimgs/JGrqMnV.png', # depricate lena + 'astro.png': 'https://wildbookiarepository.azureedge.net/testimgs/KXhKM72.png', # Use instead of lena + 'carl.jpg': 'https://wildbookiarepository.azureedge.net/testimgs/flTHWFD.jpg', + 'easy1.png': 'https://wildbookiarepository.azureedge.net/testimgs/Qqd0VNq.png', + 'easy2.png': 'https://wildbookiarepository.azureedge.net/testimgs/BDP8MIu.png', + 'easy3.png': 'https://wildbookiarepository.azureedge.net/testimgs/zBcm5mS.png', + 'hard3.png': 'https://wildbookiarepository.azureedge.net/testimgs/ST91yBf.png', + 'zebra.png': 'https://wildbookiarepository.azureedge.net/testimgs/58hbGcd.png', + 'star.png': 'https://wildbookiarepository.azureedge.net/testimgs/d2FHuIU.png', + 'patsy.jpg': 'https://wildbookiarepository.azureedge.net/testimgs/C1lNRfT.jpg', } From 8908245e0bd833d4c9becb1f07cedb26b678d062 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 22:37:01 -0400 Subject: [PATCH 02/17] Update python-publish.yml --- .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 19970e5e..ee46ca25 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -52,7 +52,7 @@ jobs: pip install build python -m build --sdist --outdir dist/ . - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: path: ./dist/*.tar.gz @@ -62,7 +62,7 @@ jobs: # upload to PyPI on every tag starting with 'v' if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4 with: name: artifact path: dist From 91cdf6606dc0eb8372a17ee17e0d25bb71bed4b1 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 22:39:45 -0400 Subject: [PATCH 03/17] Update python-publish.yml --- .github/workflows/python-publish.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index ee46ca25..697d4acd 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -15,12 +15,12 @@ jobs: python-version: [3.8] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: # This allows the setuptools_scm library to discover the tag version from git fetch-depth: 0 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 name: Install Python with: python-version: ${{ matrix.python-version }} @@ -31,7 +31,7 @@ jobs: pip install build python -m build --wheel --outdir dist/ . - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: path: ./dist/*.whl From 0caa6974b7f2f330c32d0c55c778d64a30e1838c Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 22:40:05 -0400 Subject: [PATCH 04/17] Update testing.yml --- .github/workflows/testing.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 1958bba4..5c100cd7 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -10,9 +10,9 @@ jobs: name: Lint code runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 name: Install Python with: python-version: '3.8' @@ -42,7 +42,7 @@ jobs: steps: # Checkout and env setup - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: From e59fe14148855edccc171f6b5cd04c4d41a68647 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 22:55:00 -0400 Subject: [PATCH 05/17] Update python-publish.yml --- .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 697d4acd..12f982ad 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -39,9 +39,9 @@ jobs: name: Build source distribution runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 name: Install Python with: python-version: '3.8' From 5cce53bedc937c6c86ad893e46a94c439852788c Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 22:55:38 -0400 Subject: [PATCH 06/17] Update testing.yml --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 5c100cd7..bde899e9 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -44,7 +44,7 @@ jobs: # Checkout and env setup - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} From 3ecebbc01052789c9197f421ff4d73e31c8b7503 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 22:59:48 -0400 Subject: [PATCH 07/17] Update util_dict.py --- utool/util_dict.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utool/util_dict.py b/utool/util_dict.py index 2072aa56..68ee1c82 100755 --- a/utool/util_dict.py +++ b/utool/util_dict.py @@ -865,7 +865,7 @@ def is_dicteq(dict1_, dict2_, almosteq_ok=True, verbose_err=True): try: for (key1, val1), (key2, val2) in zip(dict1_.items(), dict2_.items()): assert key1 == key2, 'key mismatch' - assert type(val1) == type(val2), 'vals are not same type' + assert isinstance(val1, type(val2)), 'vals are not same type' if HAVE_NUMPY and np.iterable(val1): if almosteq_ok and ut.is_float(val1): assert np.all( From 572910ec6d64ee498b9eda41fd16bbd9dcd6f274 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 23:01:25 -0400 Subject: [PATCH 08/17] Update util_hash.py --- utool/util_hash.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utool/util_hash.py b/utool/util_hash.py index 2d81643e..57136ea5 100755 --- a/utool/util_hash.py +++ b/utool/util_hash.py @@ -209,7 +209,7 @@ def make_hash(o): References: http://stackoverflow.com/questions/5884066/hashing-a-python-dictionary """ - if type(o) == DictProxyType: + if isinstance(o, DictProxyType): o2 = {} for k, v in o.items(): if not k.startswith('__'): From 94e68df90bbc67e6a466d6ab9824e87e0431f30f Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 23:05:05 -0400 Subject: [PATCH 09/17] Update util_list.py --- utool/util_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utool/util_list.py b/utool/util_list.py index bdbefa0f..08bbc24e 100755 --- a/utool/util_list.py +++ b/utool/util_list.py @@ -2825,7 +2825,7 @@ def type_profile2(sequence, TypedSequence=None): isinstance(sequence, np.ndarray) and sequence.dtype != object ): # Scalar / ndarray type - if type(sequence) == 'numpy.ndarray': + if isinstance(sequence, np.ndarray): subtype_list = '[%s]' % (sequence.dtype,) else: subtype_list = None From 8557b90da1f24e796023957dea2473773d7c3e78 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 23:08:02 -0400 Subject: [PATCH 10/17] Update python-publish.yml --- .github/workflows/python-publish.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 12f982ad..ec1fec10 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -34,7 +34,8 @@ jobs: - uses: actions/upload-artifact@v4 with: path: ./dist/*.whl - + overwrite: true + build_sdist: name: Build source distribution runs-on: ubuntu-latest @@ -55,7 +56,8 @@ jobs: - uses: actions/upload-artifact@v4 with: path: ./dist/*.tar.gz - + overwrite: true + upload_pypi: needs: [build_wheels, build_sdist] runs-on: ubuntu-latest From e6446f865e4e228fa22e79382488fd50dc8e7336 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 23:10:05 -0400 Subject: [PATCH 11/17] Update Printable.py --- utool/Printable.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utool/Printable.py b/utool/Printable.py index c2760817..9b1b860a 100755 --- a/utool/Printable.py +++ b/utool/Printable.py @@ -164,7 +164,7 @@ def printableVal(val, type_bit=True, justlength=False): else: _valstr = '[ ' + (', \n '.join([str(v) for v in val])) + ' ]' # ??? isinstance(val, AbstractPrintable): - elif hasattr(val, 'get_printable') and type(val) != type: + elif hasattr(val, 'get_printable') and not isinstance(val, type): _valstr = val.get_printable(type_bit=type_bit) elif isinstance(val, dict): _valstr = '{\n' From 0ed639268b7916a0796675844ba84ceca34bd661 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 23:12:25 -0400 Subject: [PATCH 12/17] Update util_arg.py --- utool/util_arg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utool/util_arg.py b/utool/util_arg.py index e74dc080..218b1c85 100755 --- a/utool/util_arg.py +++ b/utool/util_arg.py @@ -1237,7 +1237,7 @@ def get_cmdline_varargs(argv=None): # Do I like these more? # varargs = get_varargs -argval = get_argval +argval_ = get_argval argflag = get_argflag From 063687709b8072fb3146659bc1332a320fc08050 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 23:15:51 -0400 Subject: [PATCH 13/17] Update testing.yml --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index bde899e9..1fe2a4c4 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -38,7 +38,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - python-version: [3.7, 3.8, 3.9] + python-version: [3.7.17, 3.8, 3.9] steps: # Checkout and env setup From f14b98ee268ad531b6b2a4598c0f1e66d3b796ce Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 23:20:48 -0400 Subject: [PATCH 14/17] Update testing.yml --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 1fe2a4c4..a1e5b8d7 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -38,7 +38,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - python-version: [3.7.17, 3.8, 3.9] + python-version: [3.8, 3.9] steps: # Checkout and env setup From 2e9f26b64039db9e48b330820bac60fda0940de5 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 23:21:57 -0400 Subject: [PATCH 15/17] Update testing.yml --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index a1e5b8d7..2028296d 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -38,7 +38,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - python-version: [3.8, 3.9] + python-version: [3.7,3.8, 3.9] steps: # Checkout and env setup From 55c23219bb1c7b1dfa8107f5195cd4bcd945c204 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 23:24:54 -0400 Subject: [PATCH 16/17] Update testing.yml --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 2028296d..a1e5b8d7 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -38,7 +38,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - python-version: [3.7,3.8, 3.9] + python-version: [3.8, 3.9] steps: # Checkout and env setup From d8820c2fd2a87403e3ac5c6e14cc9d5049f8f1cd Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 19 Aug 2025 23:33:15 -0400 Subject: [PATCH 17/17] Update testing.yml --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index a1e5b8d7..6c9a49b9 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -37,7 +37,7 @@ jobs: max-parallel: 2 fail-fast: false matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest] #, macos-latest] python-version: [3.8, 3.9] steps: