Merge pull request #115 from michamos/no-author-conflicts-arxiv-on-pu…

…blisher config: ignore arXiv author updates when published
inspirehep · Jan 22, 2024 · 6deeaf6 · 6deeaf6
2 parents f7e2ffe + 22666dd
commit 6deeaf6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 25 deletions.
diff --git a/.github/actions/install-python-dependencies/action.yml b/.github/actions/install-python-dependencies/action.yml
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
@@ -11,31 +11,34 @@ 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
         uses: actions/checkout@v2
         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/[email protected]
         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

diff --git 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,