From 8b63a69e3ff99e858cec6a69fc1e8c3ea3d1e18b Mon Sep 17 00:00:00 2001
From: Micha Moskovic <michamos@gmail.com>
Date: Fri, 19 Jan 2024 16:38:02 +0100
Subject: [PATCH 1/2] config: ignore arXiv author updates when published

---
 inspire_json_merger/config.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/inspire_json_merger/config.py b/inspire_json_merger/config.py
index 159a11d..192ddb5 100644
--- a/inspire_json_merger/config.py
+++ b/inspire_json_merger/config.py
@@ -153,7 +153,6 @@ class ArxivOnPublisherOperations(MergerConfigurationOperations):
         'abstracts': U.KEEP_UPDATE_AND_HEAD_ENTITIES_HEAD_FIRST,
         'arxiv_eprints': U.KEEP_UPDATE_AND_HEAD_ENTITIES_HEAD_FIRST,
         'arxiv_eprints.categories': U.KEEP_ONLY_UPDATE_ENTITIES,
-        'authors': U.KEEP_UPDATE_ENTITIES_CONFLICT_ON_HEAD_DELETE,
         'authors.ids': U.KEEP_UPDATE_AND_HEAD_ENTITIES_HEAD_FIRST,
         'authors.raw_affiliations': U.KEEP_ONLY_HEAD_ENTITIES,
         'core': D.FALLBACK_KEEP_HEAD,

From 22666ddd3c22c18d91184fdf885f9bf906698f85 Mon Sep 17 00:00:00 2001
From: Micha Moskovic <michamos@gmail.com>
Date: Fri, 19 Jan 2024 16:44:27 +0100
Subject: [PATCH 2/2] github: fix CI for python 2.7

---
 .../install-python-dependencies/action.yml    | 15 -------------
 .github/workflows/build-and-release.yml       | 21 +++++++++++--------
 2 files changed, 12 insertions(+), 24 deletions(-)
 delete mode 100644 .github/actions/install-python-dependencies/action.yml

diff --git a/.github/actions/install-python-dependencies/action.yml b/.github/actions/install-python-dependencies/action.yml
deleted file mode 100644
index 7cac9d2..0000000
--- a/.github/actions/install-python-dependencies/action.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Install python dependencies
-description: Setup python packages and requirements
-
-runs:
-  using: composite
-  steps:
-    - name: Setup python additional packages
-      shell: bash
-      run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade setuptools wheel coveralls
-
-    - name: Install requirements
-      shell: bash
-      run: pip install -r requirements.txt
\ No newline at end of file
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index d1743dd..8359dbb 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -11,7 +11,11 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [2.7, 3.6]
+        include:
+          - python: python3
+            pip: pip3
+          - python: python2
+            pip: pip
 
     steps:
       - name: Checkout
@@ -19,23 +23,22 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-
       - name: Cache Python
         uses: actions/cache@v2.1.3
         id: cache
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ github.sha }}
+          key: ${{ runner.os }}-pip-${{ matrix.python }}-${{ github.sha }}
 
       - name: Install python dependencies
-        uses: ./.github/actions/install-python-dependencies
+        run: |
+          ${{ matrix.pip }} install --user --upgrade pip
+          ${{ matrix.pip }} --no-cache-dir install --user setuptools wheel "urllib3==1.25.11"
+          ${{ matrix.pip }} --no-cache-dir install --user -r requirements.txt
 
       - name: Show python dependencies
-        run: pip freeze
+          ${{ matrix.python }} --version
+          ${{ matrix.pip }} freeze
 
       - name: Run tests
         uses: ./.github/actions/run-tests