Merge pull request #82 from ioannistsanaktsidis/837-patch-json-merger

list_unify: limit conflicts to threshold

Author: ioannistsanaktsidis

.editorconfig

@@ -0,0 +1,36 @@
+name: test (python 2.7)
+
+on:
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        include:
+          - python: python2
+            pip: pip
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Install python dependencies
+        run: |
+          wget https://bootstrap.pypa.io/pip/2.7/get-pip.py
+          ${{ matrix.python }} get-pip.py
+          ${{ matrix.python }} -m ${{ matrix.pip }} install --user --upgrade pip
+          ${{ matrix.python }} -m ${{ matrix.pip }} --no-cache-dir install --user -e .[all]
+
+      - name: Show python dependencies
+        run: |
+          ${{matrix.pip}} --version
+          ${{ matrix.python }} --version
+          ${{ matrix.pip }} freeze
+
+      - name: Run tests
+        run: |
+          ./run-tests.sh

.github/workflows/build-and-release-py2.yml

@@ -1,29 +1,24 @@
-name: Build and release
+name: test and bump
 
 on:
   push:
     branches: [master]
   pull_request:
     branches: [master]
-  release:
-    types: [published]
 
 jobs:
-  Test:
+  test:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [2.7, 3.6]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
-          python-version: ${{ matrix.python-version }}
+          fetch-depth: 0
 
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: '3.11'
 
       - name: Install python dependencies
         run: |
@@ -39,14 +34,48 @@ jobs:
         run: |
           ./run-tests.sh
 
-      - name: Build package
-        if: ${{ success() && github.event_name == 'release' && matrix.python-version == '3.6'  }}
+  bump:
+    outputs:
+      new_sha: ${{ steps.sha.outputs.SHA }}
+    needs: test
+    if: ${{ github.event_name == 'push' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Install bump2version
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          pip install bump2version
+
+      - name: Configure git
+        shell: bash
+        run: |
+          git config user.name github-actions
+          git config user.email [email protected]
+
+      - name: Bump version
+        shell: bash
         run: |
-          python setup.py sdist bdist_wheel
+          bump2version patch --tag --verbose
 
-      - name: Publish package
-        if: ${{ success() && github.event_name == 'release' && matrix.python-version == '3.6'  }}
-        uses: pypa/[email protected]
+      - name: Push changes
+        uses: ad-m/github-push-action@master
         with:
-          user: __token__
-          password: ${{ secrets.pypi_token }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ github.ref }}
+          tags: true
+
+      - name: get sha
+        id: sha
+        run: |
+          sha_new=$(git rev-parse HEAD)
+          echo $sha_new
+          echo "::set-output name=SHA::$sha_new"