Skip to content

Commit

Permalink
Merge pull request inspirehep#163 from david-caro/upgrade_to_schemas_46
Browse files Browse the repository at this point in the history
General upgrade to inspire-schemas 46
  • Loading branch information
david-caro authored Aug 24, 2017
2 parents f86419a + 56e8991 commit d42ea7d
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 113 deletions.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

install_requires = [
'autosemver~=0.2',
'inspire-schemas~=42.0',
'inspire-dojson~=41.0',
'inspire-schemas~=46.0',
'inspire-dojson~=46.0',
'Scrapy>=1.1.0',
# TODO: unpin once they support wheel building again
'scrapyd==1.1.0',
Expand Down
36 changes: 0 additions & 36 deletions tests/functional/desy/fixtures/desy_ftp_records.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
"submission_number": "5652c7f6190f11e79e8000224dabeaad",
"datetime": "2017-04-03T10:26:40.365216"
},
"_collections": [
"Literature"
],
"_fft": [
{
"version": 1,
Expand Down Expand Up @@ -43,12 +40,6 @@
"title": "Towards a Fully Integrated Accelerator on a Chip: Dielectric Laser\n Acceleration (DLA) From the Source to Relativistic Electrons\n "
}
],
"urls": [
{
"description": "Fulltext",
"value": "http://inspirehep.net/record/1608652/files/Towards a fully\n integrated acc on a chip.pdf\n "
}
],
"dois": [
{
"value": "10.18429/JACoW-IPAC2017-WEYB1"
Expand Down Expand Up @@ -82,9 +73,6 @@
"submission_number": "5652c7f6190f11e79e8000224dabeaad",
"datetime": "2017-04-03T10:26:40.365216"
},
"_collections": [
"Literature"
],
"_fft": [
{
"version": 1,
Expand Down Expand Up @@ -120,12 +108,6 @@
"title": "Towards a Fully Integrated Accelerator on a Chip: Dielectric Laser\n Acceleration (DLA) From the Source to Relativistic Electrons\n "
}
],
"urls": [
{
"description": "Fulltext",
"value": "http://inspirehep.net/record/1608652/files/Towards a fully\n integrated acc on a chip.pdf\n "
}
],
"dois": [
{
"value": "10.18429/JACoW-IPAC2017-WEYB1"
Expand Down Expand Up @@ -159,9 +141,6 @@
"submission_number": "5652c7f6190f11e79e8000224dabeaad",
"datetime": "2017-04-03T10:26:40.365216"
},
"_collections": [
"Literature"
],
"_fft": [
{
"version": 1,
Expand Down Expand Up @@ -197,12 +176,6 @@
"title": "Towards a Fully Integrated Accelerator on a Chip: Dielectric Laser\n Acceleration (DLA) From the Source to Relativistic Electrons\n "
}
],
"urls": [
{
"description": "Fulltext",
"value": "http://inspirehep.net/record/1608652/files/Towards a fully\n integrated acc on a chip.pdf\n "
}
],
"dois": [
{
"value": "10.18429/JACoW-IPAC2017-WEYB1"
Expand Down Expand Up @@ -236,9 +209,6 @@
"submission_number": "5652c7f6190f11e79e8000224dabeaad",
"datetime": "2017-04-03T10:26:40.365216"
},
"_collections": [
"Literature"
],
"_fft": [
{
"version": 1,
Expand Down Expand Up @@ -274,12 +244,6 @@
"title": "Towards a Fully Integrated Accelerator on a Chip: Dielectric Laser\n Acceleration (DLA) From the Source to Relativistic Electrons\n "
}
],
"urls": [
{
"description": "Fulltext",
"value": "http://inspirehep.net/record/1608652/files/Towards a fully\n integrated acc on a chip.pdf\n "
}
],
"dois": [
{
"value": "10.18429/JACoW-IPAC2017-WEYB1"
Expand Down
36 changes: 0 additions & 36 deletions tests/functional/desy/fixtures/desy_local_records.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
"submission_number": "5652c7f6190f11e79e8000224dabeaad",
"datetime": "2017-04-03T10:26:40.365216"
},
"_collections": [
"Literature"
],
"_fft": [
{
"version": 1,
Expand Down Expand Up @@ -43,12 +40,6 @@
"title": "Towards a Fully Integrated Accelerator on a Chip: Dielectric Laser\n Acceleration (DLA) From the Source to Relativistic Electrons\n "
}
],
"urls": [
{
"description": "Fulltext",
"value": "http://inspirehep.net/record/1608652/files/Towards a fully\n integrated acc on a chip.pdf\n "
}
],
"dois": [
{
"value": "10.18429/JACoW-IPAC2017-WEYB1"
Expand Down Expand Up @@ -82,9 +73,6 @@
"submission_number": "5652c7f6190f11e79e8000224dabeaad",
"datetime": "2017-04-03T10:26:40.365216"
},
"_collections": [
"Literature"
],
"_fft": [
{
"version": 1,
Expand Down Expand Up @@ -120,12 +108,6 @@
"title": "Towards a Fully Integrated Accelerator on a Chip: Dielectric Laser\n Acceleration (DLA) From the Source to Relativistic Electrons\n "
}
],
"urls": [
{
"description": "Fulltext",
"value": "http://inspirehep.net/record/1608652/files/Towards a fully\n integrated acc on a chip.pdf\n "
}
],
"dois": [
{
"value": "10.18429/JACoW-IPAC2017-WEYB1"
Expand Down Expand Up @@ -159,9 +141,6 @@
"submission_number": "5652c7f6190f11e79e8000224dabeaad",
"datetime": "2017-04-03T10:26:40.365216"
},
"_collections": [
"Literature"
],
"_fft": [
{
"version": 1,
Expand Down Expand Up @@ -197,12 +176,6 @@
"title": "Towards a Fully Integrated Accelerator on a Chip: Dielectric Laser\n Acceleration (DLA) From the Source to Relativistic Electrons\n "
}
],
"urls": [
{
"description": "Fulltext",
"value": "http://inspirehep.net/record/1608652/files/Towards a fully\n integrated acc on a chip.pdf\n "
}
],
"dois": [
{
"value": "10.18429/JACoW-IPAC2017-WEYB1"
Expand Down Expand Up @@ -236,9 +209,6 @@
"submission_number": "5652c7f6190f11e79e8000224dabeaad",
"datetime": "2017-04-03T10:26:40.365216"
},
"_collections": [
"Literature"
],
"_fft": [
{
"version": 1,
Expand Down Expand Up @@ -274,12 +244,6 @@
"title": "Towards a Fully Integrated Accelerator on a Chip: Dielectric Laser\n Acceleration (DLA) From the Source to Relativistic Electrons\n "
}
],
"urls": [
{
"description": "Fulltext",
"value": "http://inspirehep.net/record/1608652/files/Towards a fully\n integrated acc on a chip.pdf\n "
}
],
"dois": [
{
"value": "10.18429/JACoW-IPAC2017-WEYB1"
Expand Down
39 changes: 0 additions & 39 deletions tests/unit/test_desy.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,6 @@ def override_generated_fields(record):
def test_pipeline_record(generated_record):
expected = {
'$schema': 'hep.json',
'_collections': [
'Literature'
],
'_fft': [
{
'creation_datetime': '2017-06-27T09:43:17',
Expand Down Expand Up @@ -196,16 +193,6 @@ def test_pipeline_record(generated_record):
'From the Source to Relativistic Electrons\n '
)
}
],
'urls': [
{
'description': 'Fulltext',
'value': (
'http://inspirehep.net/record/1608652/files/Towards '
'a fully\n integrated acc on a chip.pdf'
'\n '
)
}
]
}

Expand All @@ -229,9 +216,6 @@ def test_pipeline_collection_records(generated_records):
"submission_number": "5652c7f6190f11e79e8000224dabeaad",
"datetime": "2017-05-04T17:49:07.975168"
},
"_collections": [
"Literature"
],
"_fft": [
{
'creation_datetime': '2017-06-27T09:43:17',
Expand Down Expand Up @@ -293,16 +277,6 @@ def test_pipeline_collection_records(generated_records):
)
}
],
"urls": [
{
"description": "Fulltext",
"value": (
'http://inspirehep.net/record/1608652/files/'
'Towards a fully\n integrated acc on a '
'chip.pdf\n '
)
}
],
"dois": [
{
"value": "10.18429/JACoW-IPAC2017-WEYB1"
Expand Down Expand Up @@ -354,9 +328,6 @@ def test_pipeline_collection_records(generated_records):
"submission_number": "5652c7f6190f11e79e8000224dabeaad",
"datetime": "2017-05-04T17:49:07.975168"
},
"_collections": [
"Literature"
],
"_fft": [
{
'creation_datetime': '2017-06-27T09:43:17',
Expand Down Expand Up @@ -418,16 +389,6 @@ def test_pipeline_collection_records(generated_records):
)
}
],
"urls": [
{
"description": "Fulltext",
"value": (
"http://inspirehep.net/record/1608652/files/"
"Towards a fully\n integrated acc on a "
"chip.pdf\n "
)
}
],
"dois": [
{
"value": "10.18429/JACoW-IPAC2017-WEYB1"
Expand Down

0 comments on commit d42ea7d

Please sign in to comment.