Resolve merge conflicts

Author: tanujjain

.bumpversion.cfg

@@ -1,5 +1,9 @@
 [bumpversion]
+<<<<<<< HEAD
 current_version = 0.3.2
+=======
+current_version = 0.3.3
+>>>>>>> master
 commit = False
 tag = True
 

.github/workflows/build_wheels.yml

@@ -14,16 +14,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-11, windows-2019]
+        os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.11.1
+        uses: pypa/cibuildwheel@v2.23.3
         env:
           CIBW_BEFORE_BUILD: pip install "cython>=0.29"
-          CIBW_SKIP: cp36-* cp37-* cp311-* pp37-* pp38-* pp39-* cp38-manylinux_i686 cp39-manylinux_i686 cp310-manylinux_i686 cp38-musllinux* cp39-musllinux* cp310-musllinux*
+          CIBW_SKIP: cp36-* cp37-* cp313-* pp* *-musllinux* *-manylinux_i686
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: wheels-${{ matrix.os }}-${{ github.run_id }}
           path: ./wheelhouse/*.whl

.github/workflows/codeql.yml

@@ -32,19 +32,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'python' ]
+        language: [ 'python', 'cpp' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Use only 'java' to analyze code written in Java, Kotlin or both
         # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -71,6 +71,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

CODEOWNERS

@@ -0,0 +1 @@
+@tanujjain @datitran @clennan

imagededup/__init__.py

@@ -1 +1,5 @@
+<<<<<<< HEAD
 __version__ = '0.3.2'
+=======
+__version__ = '0.3.3'
+>>>>>>> master