From c1d4d67e1bed64aee7b93cfbd38ebbfd05496c9a Mon Sep 17 00:00:00 2001 From: Kelly Lockhart <2926089+kelockhart@users.noreply.github.com> Date: Wed, 17 Dec 2025 13:37:24 -0500 Subject: [PATCH 01/12] Added pub_abbrev support --- aip/classic/enforce_schema.py | 5 +++-- aip/classic/solr_adapter.py | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/aip/classic/enforce_schema.py b/aip/classic/enforce_schema.py index c31b5ac..d0db2dd 100644 --- a/aip/classic/enforce_schema.py +++ b/aip/classic/enforce_schema.py @@ -230,8 +230,9 @@ def _generalEnforcer(self,block): r['publication']['altbibcode'] = g('bibcode') r['publication']['publisher'] = g('publisher') r['publication']['name'] = { - 'raw': g('journal'), - 'canonical': g('canonical_journal'), + 'raw': g('journal'), + 'canonical': g('canonical_journal'), + 'abbreviation': g('canonical_journal_abbreviation'), } if g('series'): diff --git a/aip/classic/solr_adapter.py b/aip/classic/solr_adapter.py index c952c07..9e92b73 100644 --- a/aip/classic/solr_adapter.py +++ b/aip/classic/solr_adapter.py @@ -91,6 +91,7 @@ class SolrAdapter(object): 'page_count': 0, 'pub': u'', 'pubnote': [u'',], + 'pub_abbrev': u'', 'pub_raw': u'', 'pubdate': u'', 'publisher': u'', @@ -462,6 +463,9 @@ def _page_count(ADS_record): def _pub(ADS_record): return {'pub': ADS_record['metadata']['general'].get('publication', {}).get('name', {}).get('canonical')} + def _pub_abbrev(ADS_record): + return {'pub_abbrev': ADS_record['metadata']['general'].get('publication', {}).get('name', {}).get('abbreviation')} + @staticmethod def _pub_raw(ADS_record): return {'pub_raw': ADS_record['metadata']['general'].get('publication', {}).get('name', {}).get('raw')} From 2d5fb8cd746a227f518463b16d3b791ac5cdc98a Mon Sep 17 00:00:00 2001 From: Kelly Lockhart <2926089+kelockhart@users.noreply.github.com> Date: Wed, 17 Dec 2025 13:51:39 -0500 Subject: [PATCH 02/12] Updated github actions image version --- .github/workflows/python_actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 13ac462..8b2249b 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -5,7 +5,7 @@ on: [pull_request] jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From b77d3e032b2115c31601d909febc3121883a022c Mon Sep 17 00:00:00 2001 From: Kelly Lockhart <2926089+kelockhart@users.noreply.github.com> Date: Wed, 17 Dec 2025 14:02:19 -0500 Subject: [PATCH 03/12] Updated github actions image version --- .github/workflows/python_actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 8b2249b..2406e9e 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -5,7 +5,7 @@ on: [pull_request] jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 From 96bab53d16762404a07dfcb653b2b55574610011 Mon Sep 17 00:00:00 2001 From: Kelly Lockhart <2926089+kelockhart@users.noreply.github.com> Date: Wed, 17 Dec 2025 14:42:34 -0500 Subject: [PATCH 04/12] Fixed bug --- aip/classic/solr_adapter.py | 1 + 1 file changed, 1 insertion(+) diff --git a/aip/classic/solr_adapter.py b/aip/classic/solr_adapter.py index 9e92b73..4d0f671 100644 --- a/aip/classic/solr_adapter.py +++ b/aip/classic/solr_adapter.py @@ -463,6 +463,7 @@ def _page_count(ADS_record): def _pub(ADS_record): return {'pub': ADS_record['metadata']['general'].get('publication', {}).get('name', {}).get('canonical')} + @staticmethod def _pub_abbrev(ADS_record): return {'pub_abbrev': ADS_record['metadata']['general'].get('publication', {}).get('name', {}).get('abbreviation')} From 63019138664c3e3eede242e0276bb2e76979a50c Mon Sep 17 00:00:00 2001 From: Kelly Lockhart <2926089+kelockhart@users.noreply.github.com> Date: Wed, 17 Dec 2025 14:52:33 -0500 Subject: [PATCH 05/12] Unittests --- tests/classic/test_solr_adapter.py | 1 + tests/stubdata/ADSRecords/testbibcode | 1 + tests/stubdata/mergerdata.py | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/classic/test_solr_adapter.py b/tests/classic/test_solr_adapter.py index 0526af2..8a85cd2 100644 --- a/tests/classic/test_solr_adapter.py +++ b/tests/classic/test_solr_adapter.py @@ -62,6 +62,7 @@ def test_SolrAdapter(self): 'page_count': 0, 'pubdate': u'2013-08-05', 'publisher': u'test-Publisher', + 'pub_abbrev': u'Test Pub.', 'title': [u'This is of the title', u'This is of the alternate'], 'volume': u'l24'}) diff --git a/tests/stubdata/ADSRecords/testbibcode b/tests/stubdata/ADSRecords/testbibcode index 652c31c..60d605d 100644 --- a/tests/stubdata/ADSRecords/testbibcode +++ b/tests/stubdata/ADSRecords/testbibcode @@ -43,6 +43,7 @@ 'page': u'2056-2078', 'page_count': 0, 'publisher': u'test-Publisher', + 'pub_abbrev': u'Test Pub.', 'volume': u'l24'}, 'titles': [{'lang': u'en', 'text': u'This is of the title'}, {'lang': '', 'text': u'This is of the alternate'}]}, diff --git a/tests/stubdata/mergerdata.py b/tests/stubdata/mergerdata.py index 7833aa2..30b4eca 100644 --- a/tests/stubdata/mergerdata.py +++ b/tests/stubdata/mergerdata.py @@ -59,6 +59,7 @@ u'American Astronomical Society, AAS Meeting #215, #428.16; Bulletin of the American Astronomical Society, Vol. 42, p.347'), (u'canonical_journal', u'American Astronomical Society Meeting Abstracts #215'), + (u'canonical_journal_abbreviation', u'Test Pub.'), (u'electronic_id', u'428.16'), (u'publication_year', u'2010'), (u'volume', u'215'), @@ -257,7 +258,8 @@ 'electronic_id': u'428.16', 'issue': None, 'name': {'canonical': u'American Astronomical Society Meeting Abstracts #215', - 'raw': u'American Astronomical Society, AAS Meeting #215, #428.16; Bulletin of the American Astronomical Society, Vol. 42, p.347'}, + 'raw': u'American Astronomical Society, AAS Meeting #215, #428.16; Bulletin of the American Astronomical Society, Vol. 42, p.347', + 'abbreviation': u'Test Pub.'}, 'origin': u'AAS', 'page': None, 'page_count': None, From b620e44ced423b2db1591de8998b8794af475c53 Mon Sep 17 00:00:00 2001 From: Kelly Lockhart <2926089+kelockhart@users.noreply.github.com> Date: Wed, 17 Dec 2025 15:01:29 -0500 Subject: [PATCH 06/12] verbose --- .github/workflows/python_actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 2406e9e..78b4475 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -44,7 +44,7 @@ jobs: - name: Test with pytest run: | - py.test + py.test -vv - uses: actions/upload-artifact@v4 with: From 0fe1668708db2a77c82063d5c5490357fc37b908 Mon Sep 17 00:00:00 2001 From: Kelly Lockhart <2926089+kelockhart@users.noreply.github.com> Date: Thu, 18 Dec 2025 12:03:26 -0500 Subject: [PATCH 07/12] Tests working, adding more --- aip/classic/solr_adapter.py | 2 +- tests/classic/test_read_records.py | 6 ++++-- tests/stubdata/ADSRecords/2009AAS...21320006C.classic | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/aip/classic/solr_adapter.py b/aip/classic/solr_adapter.py index 4d0f671..44179f7 100644 --- a/aip/classic/solr_adapter.py +++ b/aip/classic/solr_adapter.py @@ -465,7 +465,7 @@ def _pub(ADS_record): @staticmethod def _pub_abbrev(ADS_record): - return {'pub_abbrev': ADS_record['metadata']['general'].get('publication', {}).get('name', {}).get('abbreviation')} + return {'pub_abbrev': ADS_record['metadata']['general'].get('publication', {}).get('pub_abbrev', {})} @staticmethod def _pub_raw(ADS_record): diff --git a/tests/classic/test_read_records.py b/tests/classic/test_read_records.py index c9729b4..6817780 100644 --- a/tests/classic/test_read_records.py +++ b/tests/classic/test_read_records.py @@ -161,7 +161,8 @@ def test_readRecordsFromADSExports(self): 'electronic_id': u'200', 'issue': None, 'name': {'canonical': u'American Astronomical Society Meeting Abstracts #213', - 'raw': u'American Astronomical Society, AAS Meeting #213, id.200.06; Bulletin of the American Astronomical Society, Vol. 41, p.187'}, + 'raw': u'American Astronomical Society, AAS Meeting #213, id.200.06; Bulletin of the American Astronomical Society, Vol. 41, p.187', + 'abbreviation': u'Test Pub.'}, 'origin': u'AAS', 'page': None, 'page_count': None, @@ -201,7 +202,8 @@ def test_readRecordsFromADSExports(self): 'electronic_id': None, 'issue': None, 'name': {'canonical': u'Bulletin of the American Astronomical Society', - 'raw': u'American Astronomical Society, AAS Meeting #213, id.200.06; Bulletin of the American Astronomical Society, Vol. 41, p.187'}, + 'raw': u'American Astronomical Society, AAS Meeting #213, id.200.06; Bulletin of the American Astronomical Society, Vol. 41, p.187', + 'abbreviation': u'Test Pub.'}, 'origin': u'AAS', 'page': u'187', 'page_count': None, diff --git a/tests/stubdata/ADSRecords/2009AAS...21320006C.classic b/tests/stubdata/ADSRecords/2009AAS...21320006C.classic index fd4f792..8279c5a 100644 --- a/tests/stubdata/ADSRecords/2009AAS...21320006C.classic +++ b/tests/stubdata/ADSRecords/2009AAS...21320006C.classic @@ -1 +1 @@ -OrderedDict([(u'records', OrderedDict([(u'record', OrderedDict([(u'@bibcode', u'2009AAS...21320006C'), (u'@entry_date', u'2009-01-03'), (u'metadata', [OrderedDict([(u'@origin', u'AAS'), (u'@type', u'general'), (u'@primary', u'True'), (u'@alternate_journal', u'False'), (u'creation_time', u'2016-01-21T23:19:13Z'), (u'modification_time', u'2016-01-21T23:19:13Z'), (u'bibcode', u'2009AAS...21320006C'), (u'dates', OrderedDict([(u'date', OrderedDict([(u'@type', u'date-published'), ('#text', u'2009-01-00')]))])), (u'publication_year', u'2009'), (u'publisher', u'Publisher'), (u'title', u"A New Way of Looking: the Amateur Telescope Making Movement in 1920's America"), (u'abstract', u'The hobby of astronomy in America was restricted largely to a relatively few well-off persons prior to the 1920\'s in part due to the difficulty in acquiring adequate instruments. Even modest telescopes were quite expensive and very few in number. The standard "beginner\'s\u201d instrument was a three-inch diameter refracting telescope, precision crafted by expert manufacturers. Early Twentieth-century astronomy popularizers recognized the problem of availability of instruments and saw that this hindered growth of the hobby. The idea of making one\'s own telescope was limited to a hardy few with the time, equipment, machining skills, and information required and very few attempted the task. This situation changed dramatically by the late 1920\'s due to the publication of a series of articles in Scientific American that provided detailed, practical instructions for a six-inch Newtonian reflecting telescope, a project well within the means and skills of the average "handyman". Publication of these articles initiated a profound change in perception for amateur astronomers, who quickly became amateur telescope makers as well, creating precision instruments for themselves and in part leading to a widening of the amateur astronomy hobby and interest in astronomy generally. This paper forms a portion of a doctoral dissertation being written by the author.'), (u'author', OrderedDict([(u'@nr', u'1'), (u'name', OrderedDict([(u'western', u'Cameron, Gary L.'), (u'normalized', u'Cameron, G')])), (u'affiliations', OrderedDict([(u'affiliation', u'Iowa State University')])), (u'type', u'regular')])), (u'ADSaffiliation', u'AA(Iowa State University)'), (u'journal', u'American Astronomical Society, AAS Meeting #213, id.200.06; Bulletin of the American Astronomical Society, Vol. 41, p.187'), (u'canonical_journal', u'American Astronomical Society Meeting Abstracts #213'), (u'electronic_id', u'200'), (u'volume', u'213')]), OrderedDict([(u'@origin', u'AAS'), (u'@type', u'general'), (u'@primary', u'False'), (u'@alternate_journal', u'True'), (u'creation_time', u'2016-01-21T23:20:41Z'), (u'modification_time', u'2016-01-21T23:20:41Z'), (u'bibcode', u'2009BAAS...41..187C'), (u'dates', OrderedDict([(u'date', OrderedDict([(u'@type', u'date-published'), ('#text', u'2009-01-00')]))])), (u'publication_year', u'2009'), (u'title', u"A New Way of Looking: the Amateur Telescope Making Movement in 1920's America"), (u'author', OrderedDict([(u'@nr', u'1'), (u'name', OrderedDict([(u'western', u'Cameron, Gary L.'), (u'normalized', u'Cameron, G')])), (u'affiliations', OrderedDict([(u'affiliation', u'Iowa State University')])), (u'type', u'regular')])), (u'ADSaffiliation', u'AA(Iowa State University)'), (u'journal', u'American Astronomical Society, AAS Meeting #213, id.200.06; Bulletin of the American Astronomical Society, Vol. 41, p.187'), (u'volume', u'41'), (u'page_range', u'187'), (u'canonical_journal', u'Bulletin of the American Astronomical Society'), (u'page', u'187')]), OrderedDict([(u'@origin', u'ADS metadata'), (u'@type', u'properties'), (u'@primary', u'False'), (u'@alternate_journal', u'False'), (u'JSON_timestamp', u'{"abs":[{"p":"/proj/ads/abstracts/ast/text/J39/J39-71877.abs","primary":1,"t":"1453418353"},{"a":"2009BAAS...41..187C","p":"/proj/ads/abstracts/ast/text/S39/S39-71877.abs","t":"1453418441"}],"prop":["book","nonarticle","toc"]}'), (u'databases', OrderedDict([(u'database', u'AST')])), (u'pubtype', u'abstract'), (u'private', u'0'), (u'ocrabstract', u'0'), (u'preprint', None), (u'nonarticle', u'1'), (u'refereed', u'0'), (u'openaccess', u'0'), (u'eprint_openaccess', u'0'), (u'pub_openaccess', u'0'), (u'ads_openaccess', u'0'), (u'toc', u'1')]), OrderedDict([(u'@origin', u'ADS metadata'), (u'@type', u'relations'), (u'@primary', u'False'), (u'@alternate_journal', u'False'), (u'alternates', OrderedDict([(u'alternate', OrderedDict([(u'@type', u'alternate'), ('#text', u'2009BAAS...41..187C')]))])), (u'identifiers', OrderedDict([(u'identifier', OrderedDict([(u'@type', u'identifier'),('#text', u'2009AAS...21320006C')]))])), (u'links', OrderedDict([(u'link', OrderedDict([(u'@url', u'http://adsabs.harvard.edu/abs/2009AAS...21320006C'), (u'@type', u'ADSlink')]))]))])])]))]))]) \ No newline at end of file +OrderedDict([(u'records', OrderedDict([(u'record', OrderedDict([(u'@bibcode', u'2009AAS...21320006C'), (u'@entry_date', u'2009-01-03'), (u'metadata', [OrderedDict([(u'@origin', u'AAS'), (u'@type', u'general'), (u'@primary', u'True'), (u'@alternate_journal', u'False'), (u'creation_time', u'2016-01-21T23:19:13Z'), (u'modification_time', u'2016-01-21T23:19:13Z'), (u'bibcode', u'2009AAS...21320006C'), (u'dates', OrderedDict([(u'date', OrderedDict([(u'@type', u'date-published'), ('#text', u'2009-01-00')]))])), (u'publication_year', u'2009'), (u'publisher', u'Publisher'), (u'title', u"A New Way of Looking: the Amateur Telescope Making Movement in 1920's America"), (u'abstract', u'The hobby of astronomy in America was restricted largely to a relatively few well-off persons prior to the 1920\'s in part due to the difficulty in acquiring adequate instruments. Even modest telescopes were quite expensive and very few in number. The standard "beginner\'s\u201d instrument was a three-inch diameter refracting telescope, precision crafted by expert manufacturers. Early Twentieth-century astronomy popularizers recognized the problem of availability of instruments and saw that this hindered growth of the hobby. The idea of making one\'s own telescope was limited to a hardy few with the time, equipment, machining skills, and information required and very few attempted the task. This situation changed dramatically by the late 1920\'s due to the publication of a series of articles in Scientific American that provided detailed, practical instructions for a six-inch Newtonian reflecting telescope, a project well within the means and skills of the average "handyman". Publication of these articles initiated a profound change in perception for amateur astronomers, who quickly became amateur telescope makers as well, creating precision instruments for themselves and in part leading to a widening of the amateur astronomy hobby and interest in astronomy generally. This paper forms a portion of a doctoral dissertation being written by the author.'), (u'author', OrderedDict([(u'@nr', u'1'), (u'name', OrderedDict([(u'western', u'Cameron, Gary L.'), (u'normalized', u'Cameron, G')])), (u'affiliations', OrderedDict([(u'affiliation', u'Iowa State University')])), (u'type', u'regular')])), (u'ADSaffiliation', u'AA(Iowa State University)'), (u'journal', u'American Astronomical Society, AAS Meeting #213, id.200.06; Bulletin of the American Astronomical Society, Vol. 41, p.187'), (u'canonical_journal_abbreviation', u'Test Pub.'), (u'canonical_journal', u'American Astronomical Society Meeting Abstracts #213'), (u'electronic_id', u'200'), (u'volume', u'213')]), OrderedDict([(u'@origin', u'AAS'), (u'@type', u'general'), (u'@primary', u'False'), (u'@alternate_journal', u'True'), (u'creation_time', u'2016-01-21T23:20:41Z'), (u'modification_time', u'2016-01-21T23:20:41Z'), (u'bibcode', u'2009BAAS...41..187C'), (u'dates', OrderedDict([(u'date', OrderedDict([(u'@type', u'date-published'), ('#text', u'2009-01-00')]))])), (u'publication_year', u'2009'), (u'title', u"A New Way of Looking: the Amateur Telescope Making Movement in 1920's America"), (u'author', OrderedDict([(u'@nr', u'1'), (u'name', OrderedDict([(u'western', u'Cameron, Gary L.'), (u'normalized', u'Cameron, G')])), (u'affiliations', OrderedDict([(u'affiliation', u'Iowa State University')])), (u'type', u'regular')])), (u'ADSaffiliation', u'AA(Iowa State University)'), (u'journal', u'American Astronomical Society, AAS Meeting #213, id.200.06; Bulletin of the American Astronomical Society, Vol. 41, p.187'), (u'volume', u'41'), (u'page_range', u'187'), (u'canonical_journal_abbreviation', u'Test Pub.'), (u'canonical_journal', u'Bulletin of the American Astronomical Society'), (u'page', u'187')]), OrderedDict([(u'@origin', u'ADS metadata'), (u'@type', u'properties'), (u'@primary', u'False'), (u'@alternate_journal', u'False'), (u'JSON_timestamp', u'{"abs":[{"p":"/proj/ads/abstracts/ast/text/J39/J39-71877.abs","primary":1,"t":"1453418353"},{"a":"2009BAAS...41..187C","p":"/proj/ads/abstracts/ast/text/S39/S39-71877.abs","t":"1453418441"}],"prop":["book","nonarticle","toc"]}'), (u'databases', OrderedDict([(u'database', u'AST')])), (u'pubtype', u'abstract'), (u'private', u'0'), (u'ocrabstract', u'0'), (u'preprint', None), (u'nonarticle', u'1'), (u'refereed', u'0'), (u'openaccess', u'0'), (u'eprint_openaccess', u'0'), (u'pub_openaccess', u'0'), (u'ads_openaccess', u'0'), (u'toc', u'1')]), OrderedDict([(u'@origin', u'ADS metadata'), (u'@type', u'relations'), (u'@primary', u'False'), (u'@alternate_journal', u'False'), (u'alternates', OrderedDict([(u'alternate', OrderedDict([(u'@type', u'alternate'), ('#text', u'2009BAAS...41..187C')]))])), (u'identifiers', OrderedDict([(u'identifier', OrderedDict([(u'@type', u'identifier'),('#text', u'2009AAS...21320006C')]))])), (u'links', OrderedDict([(u'link', OrderedDict([(u'@url', u'http://adsabs.harvard.edu/abs/2009AAS...21320006C'), (u'@type', u'ADSlink')]))]))])])]))]))]) \ No newline at end of file From b3cc0db6bebdae5aa1f75cb11e8d82ef97058f4b Mon Sep 17 00:00:00 2001 From: Kelly Lockhart <2926089+kelockhart@users.noreply.github.com> Date: Thu, 18 Dec 2025 13:49:41 -0500 Subject: [PATCH 08/12] Fixed tests --- .github/workflows/python_actions.yml | 2 +- aip/classic/solr_adapter.py | 2 +- tests/classic/test_solr_adapter.py | 1 + tests/stubdata/ADSRecords/testbibcode | 3 ++- tests/stubdata/ADSRecords/testbibcode2 | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 78b4475..2406e9e 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -44,7 +44,7 @@ jobs: - name: Test with pytest run: | - py.test -vv + py.test - uses: actions/upload-artifact@v4 with: diff --git a/aip/classic/solr_adapter.py b/aip/classic/solr_adapter.py index 44179f7..4d0f671 100644 --- a/aip/classic/solr_adapter.py +++ b/aip/classic/solr_adapter.py @@ -465,7 +465,7 @@ def _pub(ADS_record): @staticmethod def _pub_abbrev(ADS_record): - return {'pub_abbrev': ADS_record['metadata']['general'].get('publication', {}).get('pub_abbrev', {})} + return {'pub_abbrev': ADS_record['metadata']['general'].get('publication', {}).get('name', {}).get('abbreviation')} @staticmethod def _pub_raw(ADS_record): diff --git a/tests/classic/test_solr_adapter.py b/tests/classic/test_solr_adapter.py index 8a85cd2..2f4b41f 100644 --- a/tests/classic/test_solr_adapter.py +++ b/tests/classic/test_solr_adapter.py @@ -125,6 +125,7 @@ def test_SolrAdapter(self): [u"Kurtz, Michael J.", u"Eichhorn, Guenther", u"Accomazzi, Alberto", u"Grant, Carolyn S.", u"Murray, Stephen S.", u"Watson, Joyce M."], "author_count": 6, + "pub_abbrev": u"Test Pub.", "pub_raw": u"Astronomy and Astrophysics Supplement, v.143, p.41-59", # "cite_read_boost": 0.45, "first_author_facet_hier": [u"0/Kurtz, M", u"1/Kurtz, M/Kurtz, Michael J"], diff --git a/tests/stubdata/ADSRecords/testbibcode b/tests/stubdata/ADSRecords/testbibcode index 60d605d..5f219f1 100644 --- a/tests/stubdata/ADSRecords/testbibcode +++ b/tests/stubdata/ADSRecords/testbibcode @@ -43,7 +43,8 @@ 'page': u'2056-2078', 'page_count': 0, 'publisher': u'test-Publisher', - 'pub_abbrev': u'Test Pub.', + "name" : { + 'abbreviation': u'Test Pub.',}, 'volume': u'l24'}, 'titles': [{'lang': u'en', 'text': u'This is of the title'}, {'lang': '', 'text': u'This is of the alternate'}]}, diff --git a/tests/stubdata/ADSRecords/testbibcode2 b/tests/stubdata/ADSRecords/testbibcode2 index d772208..860603c 100644 --- a/tests/stubdata/ADSRecords/testbibcode2 +++ b/tests/stubdata/ADSRecords/testbibcode2 @@ -47,7 +47,8 @@ ], "name" : { "raw" : u"Astronomy and Astrophysics Supplement, v.143, p.41-59", - "canonical" : u"Astronomy and Astrophysics Supplement Series" + "canonical" : u"Astronomy and Astrophysics Supplement Series", + "abbreviation" : u"Test Pub.", }, "page_count" : u"19", "page" : u"41", From 1d48c93755cea6d84725a4217fbe34420823f371 Mon Sep 17 00:00:00 2001 From: Kelly Lockhart <2926089+kelockhart@users.noreply.github.com> Date: Thu, 18 Dec 2025 13:59:48 -0500 Subject: [PATCH 09/12] Debugging coveralls --- .github/workflows/python_actions.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 2406e9e..2adc0d3 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -42,9 +42,22 @@ jobs: pip install -U -r requirements.txt pip install -U -r dev-requirements.txt + - name: Show pytest/coverage versions + run: | + python -V + pip show pytest pytest-cov coverage || true + pytest --version + - name: Test with pytest run: | - py.test + py.test - + + - name: Find coverage outputs + if: always() + run: | + pwd + ls -la + find . -maxdepth 3 -name ".coverage*" -o -name "coverage.xml" -o -name "*.lcov" - uses: actions/upload-artifact@v4 with: From e0c2e2497d185ba665541c8239c0ad631831f133 Mon Sep 17 00:00:00 2001 From: Kelly Lockhart <2926089+kelockhart@users.noreply.github.com> Date: Thu, 18 Dec 2025 17:23:22 -0500 Subject: [PATCH 10/12] Debugging coveralls --- .github/workflows/python_actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 2adc0d3..b0e5980 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -46,11 +46,11 @@ jobs: run: | python -V pip show pytest pytest-cov coverage || true - pytest --version + py.test --version - name: Test with pytest run: | - py.test - + py.test - name: Find coverage outputs if: always() From 004920eb587ad5bcf3f0cbcf3e7f44f2707926b3 Mon Sep 17 00:00:00 2001 From: Kelly Lockhart <2926089+kelockhart@users.noreply.github.com> Date: Thu, 18 Dec 2025 17:32:32 -0500 Subject: [PATCH 11/12] Debugging coveralls --- .github/workflows/python_actions.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index b0e5980..3e8ed4a 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -55,14 +55,19 @@ jobs: - name: Find coverage outputs if: always() run: | - pwd + echo "upload pwd=$(pwd)" ls -la - find . -maxdepth 3 -name ".coverage*" -o -name "coverage.xml" -o -name "*.lcov" + +# - uses: actions/upload-artifact@v4 +# with: +# name: coverage-import +# path: .coverage - uses: actions/upload-artifact@v4 with: name: coverage-import - path: .coverage + path: "**/.coverage" + if-no-files-found: error coveralls: From 2859d210758e152cd2883ef8b8e5e604b5e8040a Mon Sep 17 00:00:00 2001 From: Kelly Lockhart <2926089+kelockhart@users.noreply.github.com> Date: Thu, 18 Dec 2025 17:36:46 -0500 Subject: [PATCH 12/12] Debugging coveralls --- .github/workflows/python_actions.yml | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 3e8ed4a..24a0164 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -42,31 +42,15 @@ jobs: pip install -U -r requirements.txt pip install -U -r dev-requirements.txt - - name: Show pytest/coverage versions - run: | - python -V - pip show pytest pytest-cov coverage || true - py.test --version - - name: Test with pytest run: | py.test - - name: Find coverage outputs - if: always() - run: | - echo "upload pwd=$(pwd)" - ls -la - - -# - uses: actions/upload-artifact@v4 -# with: -# name: coverage-import -# path: .coverage - uses: actions/upload-artifact@v4 with: name: coverage-import - path: "**/.coverage" + path: .coverage + include-hidden-files: true if-no-files-found: error