diff --git a/.travis.yml b/.travis.yml index 807a8d91..6b3c94f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/babel.ini b/babel.ini index 48d93389..f5adf43f 100644 --- a/babel.ini +++ b/babel.ini @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/docs/conf.py b/docs/conf.py index 74b80e9a..dfd430a9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/__init__.py b/hepdata/__init__.py index 0a25f6e0..c3d5fd42 100644 --- a/hepdata/__init__.py +++ b/hepdata/__init__.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,7 +22,7 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""Zenodo - Research. Shared.""" +"""HEPData.""" from __future__ import absolute_import, print_function diff --git a/hepdata/celery.py b/hepdata/celery.py index 87834aa1..c9ee5ea2 100644 --- a/hepdata/celery.py +++ b/hepdata/celery.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,7 +22,7 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""Zenodo celery application object.""" +"""HEPData celery application object.""" from __future__ import absolute_import, print_function diff --git a/hepdata/cli.py b/hepdata/cli.py index 099762d2..c0c39494 100644 --- a/hepdata/cli.py +++ b/hepdata/cli.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,7 +22,7 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""Zenodo CLI module.""" +"""HEPData CLI module.""" from __future__ import absolute_import, print_function diff --git a/hepdata/config.py b/hepdata/config.py index 469bdf9a..e4596043 100644 --- a/hepdata/config.py +++ b/hepdata/config.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,7 +22,7 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""Zenodo default application configuration.""" +"""HEPData default application configuration.""" from __future__ import absolute_import, print_function @@ -36,7 +36,7 @@ def _(x): # Database SQLALCHEMY_DATABASE_URI = os.environ.get( "SQLALCHEMY_DATABASE_URI", - "postgresql+psycopg2://localhost/zenodo") + "postgresql+psycopg2://localhost/hepdata") SQLALCHEMY_ECHO = False # Default language and timezone @@ -69,7 +69,7 @@ def _(x): "hepdata_theme/security/login_user.html" SECURITY_CONFIRM_SALT = "CHANGE_ME" -SECURITY_EMAIL_SENDER = "info@zenodo.org" +SECURITY_EMAIL_SENDER = "info@hepdata.net" SECURITY_EMAIL_SUBJECT_REGISTER = _("Welcome to HEPData!") SECURITY_LOGIN_SALT = "CHANGE_ME" SECURITY_PASSWORD_SALT = "CHANGE_ME" diff --git a/hepdata/factory.py b/hepdata/factory.py index 6d7bfcab..b8cef0b9 100644 --- a/hepdata/factory.py +++ b/hepdata/factory.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,7 +22,7 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""Zenodo application factories.""" +"""HEPData application factories.""" import os import sys diff --git a/hepdata/modules/__init__.py b/hepdata/modules/__init__.py index 03273753..7431a1ce 100644 --- a/hepdata/modules/__init__.py +++ b/hepdata/modules/__init__.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,4 +22,4 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""Zenodo modules.""" +"""HEPData modules.""" diff --git a/hepdata/modules/frontpage/__init__.py b/hepdata/modules/frontpage/__init__.py index fcbf02bd..6a595ee3 100644 --- a/hepdata/modules/frontpage/__init__.py +++ b/hepdata/modules/frontpage/__init__.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,6 +22,6 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""Zenodo frontpage.""" +"""HEPData frontpage.""" from __future__ import absolute_import, print_function diff --git a/hepdata/modules/frontpage/views.py b/hepdata/modules/frontpage/views.py index 71827fd6..c40df9be 100644 --- a/hepdata/modules/frontpage/views.py +++ b/hepdata/modules/frontpage/views.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,7 +22,7 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""Zenodo frontpage blueprint.""" +"""HEPData frontpage blueprint.""" from __future__ import absolute_import, print_function diff --git a/hepdata/modules/records/__init__.py b/hepdata/modules/records/__init__.py index 547dc516..b4813370 100644 --- a/hepdata/modules/records/__init__.py +++ b/hepdata/modules/records/__init__.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/records/config.py b/hepdata/modules/records/config.py index d93bb3b1..5ee98bf1 100644 --- a/hepdata/modules/records/config.py +++ b/hepdata/modules/records/config.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,7 +22,7 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""Configuration for Zenodo Records.""" +"""Configuration for HEPData Records.""" from __future__ import absolute_import, print_function @@ -30,16 +30,3 @@ from speaklater import make_lazy_gettext _ = make_lazy_gettext(lambda: gettext) - -ZENODO_RELATION_TYPES = [ - ('isCitedBy', _('Cited by')), - ('cites', _('Cites')), - ('isSupplementTo', _('Supplement to')), - ('isSupplementedBy', _('Supplementary material')), - ('references', _('References')), - ('isReferencedBy', _('Referenced by')), - ('isNewVersionOf', _('Previous versions')), - ('isPreviousVersionOf', _('New versions')), -] - -ZENODO_LOCAL_DOI_PREFIXES = [] diff --git a/hepdata/modules/records/ext.py b/hepdata/modules/records/ext.py index f1434b61..1e9b4860 100644 --- a/hepdata/modules/records/ext.py +++ b/hepdata/modules/records/ext.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -31,7 +31,7 @@ class HEPDataRecords(object): - """Zenodo records extension.""" + """HEPData records extension.""" def __init__(self, app=None): """Extension initialization.""" diff --git a/hepdata/modules/records/filters.py b/hepdata/modules/records/filters.py index 981fe9b3..669d39c2 100644 --- a/hepdata/modules/records/filters.py +++ b/hepdata/modules/records/filters.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/records/jsonschemas/__init__.py b/hepdata/modules/records/jsonschemas/__init__.py index 684fb9ff..6c7d62e6 100644 --- a/hepdata/modules/records/jsonschemas/__init__.py +++ b/hepdata/modules/records/jsonschemas/__init__.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,6 +22,6 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""JSON schemas for Zenodo.""" +"""JSON schemas for HEPData.""" from __future__ import absolute_import, print_function diff --git a/hepdata/modules/records/models.py b/hepdata/modules/records/models.py index bc989d04..03920242 100644 --- a/hepdata/modules/records/models.py +++ b/hepdata/modules/records/models.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,7 +22,7 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""Helper models for Zenodo data model.""" +"""Helper models for HEPData data model.""" from __future__ import absolute_import, print_function from invenio_accounts.models import User @@ -33,18 +33,19 @@ __author__ = 'eamonnmaguire' from invenio_db import db +from sqlalchemy_utils.types import JSONType, UUIDType db_engine = 'MyISAM' table_args = {'mysql_engine': db_engine} -submission_participant_link = db.Table('submission_participant_link', db.Column('rec_id', db.Integer, +submission_participant_link = db.Table('submission_participant_link', db.Column('rec_id', UUIDType, db.ForeignKey('hepsubmission.publication_recid')), db.Column('participant_id', db.Integer, db.ForeignKey('submissionparticipant.id')), mysql_engine=db_engine) data_reference_link = db.Table('data_resource_link', - db.Column('rec_id', db.Integer, db.ForeignKey('hepsubmission.publication_recid')), + db.Column('rec_id', UUIDType, db.ForeignKey('hepsubmission.publication_recid')), db.Column('dataresource_id', db.Integer, db.ForeignKey('dataresource.id')), mysql_engine=db_engine) @@ -56,9 +57,9 @@ class HEPSubmission(db.Model): __tablename__ = "hepsubmission" __table_args__ = table_args - publication_recid = db.Column(db.Integer, db.ForeignKey(RecordMetadata.id), primary_key=True) + publication_recid = db.Column(UUIDType, db.ForeignKey(RecordMetadata.id), primary_key=True) - data_abstract = db.Column(db.BLOB) + data_abstract = db.Column(db.Binary) references = db.relationship("DataResource", secondary="data_resource_link") # coordinators are already logged in to submit records, so we know their User id. @@ -87,7 +88,7 @@ class SubmissionParticipant(db.Model): id = db.Column(db.Integer, primary_key=True, nullable=False, autoincrement=True) - publication_recid = db.Column(db.Integer, db.ForeignKey(RecordMetadata.id)) + publication_recid = db.Column(UUIDType, db.ForeignKey(RecordMetadata.id)) full_name = db.Column(db.String(128)) email = db.Column(db.String(128)) @@ -122,10 +123,10 @@ class DataSubmission(db.Model): id = db.Column(db.Integer, primary_key=True, nullable=False, autoincrement=True) - publication_recid = db.Column(db.Integer, db.ForeignKey(RecordMetadata.id)) + publication_recid = db.Column(UUIDType, db.ForeignKey(RecordMetadata.id)) location_in_publication = db.Column(db.String(256)) name = db.Column(db.String(64)) - description = db.Column(db.BLOB()) + description = db.Column(db.Binary) keywords = db.relationship("Keyword", secondary="keyword_submission") # the main data file, with the data table @@ -157,7 +158,7 @@ class License(db.Model): name = db.Column(db.String(256)) url = db.Column(db.String(256)) - description = db.Column(db.BLOB) + description = db.Column(db.Binary) class DataResource(db.Model): @@ -169,7 +170,7 @@ class DataResource(db.Model): file_location = db.Column(db.String(256)) file_type = db.Column(db.String(64), default="json") - file_description = db.Column(db.BLOB) + file_description = db.Column(db.Binary) file_license = db.Column(db.Integer, db.ForeignKey("hepdata_license.id"), nullable=True) @@ -191,7 +192,7 @@ class DataReview(db.Model): db.Integer, primary_key=True, nullable=False, autoincrement=True) - publication_recid = db.Column(db.Integer, db.ForeignKey(RecordMetadata.id)) + publication_recid = db.Column(UUIDType, db.ForeignKey(RecordMetadata.id)) data_recid = db.Column(db.Integer, db.ForeignKey("datasubmission.id")) creation_date = db.Column( diff --git a/hepdata/modules/records/templates/hepdata_records/box/export.html b/hepdata/modules/records/templates/hepdata_records/box/export.html index e67d4560..49a9ee53 100644 --- a/hepdata/modules/records/templates/hepdata_records/box/export.html +++ b/hepdata/modules/records/templates/hepdata_records/box/export.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/records/templates/hepdata_records/box/info.html b/hepdata/modules/records/templates/hepdata_records/box/info.html index 89fd913c..fbaed3af 100644 --- a/hepdata/modules/records/templates/hepdata_records/box/info.html +++ b/hepdata/modules/records/templates/hepdata_records/box/info.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -47,29 +47,29 @@ {% if record.doi|is_local_doi %}{{doi_badge(record.doi)}}{% else %}{{ record.doi|doi_link }}{% endif %} {% endif%} - 10.5281/zenodo.32481 + 10.5281/HEPData.32481 -
+
-

Zenodo DOI Badge

+

HEPData DOI Badge

Markdown

- 
[![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.32481.svg)](http://dx.doi.org/10.5281/zenodo.32481)
+ 
[![DOI](https://HEPData.org/badge/doi/10.5281/HEPData.32481.svg)](http://dx.doi.org/10.5281/HEPData.32481)

reStructedText

- 
.. image:: https://zenodo.org/badge/doi/10.5281/zenodo.32481.svg
-     :target: http://dx.doi.org/10.5281/zenodo.32481
+ 
.. image:: https://HEPData.org/badge/doi/10.5281/HEPData.32481.svg
+     :target: http://dx.doi.org/10.5281/HEPData.32481

HTML

- 
<a href="http://dx.doi.org/10.5281/zenodo.32481"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.32481.svg" alt="10.5281/zenodo.32481"></a>
+ 
<a href="http://dx.doi.org/10.5281/HEPData.32481"><img src="https://HEPData.org/badge/doi/10.5281/HEPData.32481.svg" alt="10.5281/HEPData.32481"></a>

Image URL

- 
https://zenodo.org/badge/doi/10.5281/zenodo.32481.svg
+ 
https://HEPData.org/badge/doi/10.5281/HEPData.32481.svg

DOI URL

- 
http://dx.doi.org/10.5281/zenodo.32481
+ 
http://dx.doi.org/10.5281/HEPData.32481

diff --git a/hepdata/modules/records/templates/hepdata_records/box/publishedin.html b/hepdata/modules/records/templates/hepdata_records/box/publishedin.html index 43bd4d81..e3a134dc 100644 --- a/hepdata/modules/records/templates/hepdata_records/box/publishedin.html +++ b/hepdata/modules/records/templates/hepdata_records/box/publishedin.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/records/templates/hepdata_records/box/share.html b/hepdata/modules/records/templates/hepdata_records/box/share.html index 0aaf5aba..8e6eafd5 100644 --- a/hepdata/modules/records/templates/hepdata_records/box/share.html +++ b/hepdata/modules/records/templates/hepdata_records/box/share.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -31,7 +31,7 @@

{{_('Share')}}

- {#- NOTE: zenodo_records/record_detail.html includes the JavaScript #} + {#- NOTE: HEPData_records/record_detail.html includes the JavaScript #} {% if record.doi %}

{{_('Cite as')}}

diff --git a/hepdata/modules/records/templates/hepdata_records/macros/accessright.html b/hepdata/modules/records/templates/hepdata_records/macros/accessright.html index e91db970..4da8c855 100644 --- a/hepdata/modules/records/templates/hepdata_records/macros/accessright.html +++ b/hepdata/modules/records/templates/hepdata_records/macros/accessright.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/records/templates/hepdata_records/macros/altmetric.html b/hepdata/modules/records/templates/hepdata_records/macros/altmetric.html index fdd48b2c..1e155ff3 100644 --- a/hepdata/modules/records/templates/hepdata_records/macros/altmetric.html +++ b/hepdata/modules/records/templates/hepdata_records/macros/altmetric.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/records/templates/hepdata_records/macros/authors.html b/hepdata/modules/records/templates/hepdata_records/macros/authors.html index 3a46830e..1504c21b 100644 --- a/hepdata/modules/records/templates/hepdata_records/macros/authors.html +++ b/hepdata/modules/records/templates/hepdata_records/macros/authors.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/records/templates/hepdata_records/macros/objecttype.html b/hepdata/modules/records/templates/hepdata_records/macros/objecttype.html index 4f7db9b8..e1b35e1a 100644 --- a/hepdata/modules/records/templates/hepdata_records/macros/objecttype.html +++ b/hepdata/modules/records/templates/hepdata_records/macros/objecttype.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/records/templates/hepdata_records/meta.html b/hepdata/modules/records/templates/hepdata_records/meta.html index 9a83318b..121ac158 100644 --- a/hepdata/modules/records/templates/hepdata_records/meta.html +++ b/hepdata/modules/records/templates/hepdata_records/meta.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -24,7 +24,7 @@ FIXME: - List of authors should be injected into the template. - PDF URLS in highwire - - + - -#} @@ -49,8 +49,8 @@ {{ meta_twittercard(meta_title, meta_description) }} {# FIXME -{%- if zenodo_files -%} -{%- for file in zenodo_files|sort(attribute='comment') -%} +{%- if HEPData_files -%} +{%- for file in HEPData_files|sort(attribute='comment') -%} {%- if file.get_superformat() == '.pdf' -%}{%- endif -%} {%- endfor -%} diff --git a/hepdata/modules/records/templates/hepdata_records/record_detail.html b/hepdata/modules/records/templates/hepdata_records/record_detail.html index b2f61f70..f0f96bfa 100644 --- a/hepdata/modules/records/templates/hepdata_records/record_detail.html +++ b/hepdata/modules/records/templates/hepdata_records/record_detail.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/records/templates/hepdata_records/record_export.html b/hepdata/modules/records/templates/hepdata_records/record_export.html index e045782e..8b40262c 100644 --- a/hepdata/modules/records/templates/hepdata_records/record_export.html +++ b/hepdata/modules/records/templates/hepdata_records/record_export.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -34,7 +34,7 @@ {%- block head %} {{super()}} -{#- include "zenodo_records/meta.html" #} +{#- include "HEPData_records/meta.html" #} {%- endblock head %} {%- block page_body %} diff --git a/hepdata/modules/records/views.py b/hepdata/modules/records/views.py index 22765ac9..ae5079ca 100644 --- a/hepdata/modules/records/views.py +++ b/hepdata/modules/records/views.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,7 +22,7 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""Blueprint for Zenodo-Records.""" +"""Blueprint for HEPData-Records.""" from __future__ import absolute_import, print_function diff --git a/hepdata/modules/theme/__init__.py b/hepdata/modules/theme/__init__.py index d18e2404..83aa382c 100644 --- a/hepdata/modules/theme/__init__.py +++ b/hepdata/modules/theme/__init__.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,6 +22,6 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""Zenodo theme.""" +"""HEPData theme.""" from __future__ import absolute_import, print_function diff --git a/hepdata/modules/theme/bundles.py b/hepdata/modules/theme/bundles.py index 7377d95e..75ce23d1 100644 --- a/hepdata/modules/theme/bundles.py +++ b/hepdata/modules/theme/bundles.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/theme/static/scss/body.scss b/hepdata/modules/theme/static/scss/body.scss index 7cdbcf66..32205f6f 100644 --- a/hepdata/modules/theme/static/scss/body.scss +++ b/hepdata/modules/theme/static/scss/body.scss @@ -1,18 +1,18 @@ -// This file is part of Zenodo. +// This file is part of HEPData. // Copyright (C) 2015 CERN. // -// Zenodo is free software; you can redistribute it +// HEPData is free software; you can redistribute it // and/or modify it under the terms of the GNU General Public License as // published by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version. // -// Zenodo is distributed in the hope that it will be +// HEPData is distributed in the hope that it will be // useful, but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with Zenodo; if not, write to the +// along with HEPData; if not, write to the // Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, // MA 02111-1307, USA. // diff --git a/hepdata/modules/theme/static/scss/cover.scss b/hepdata/modules/theme/static/scss/cover.scss index df681080..068db52e 100644 --- a/hepdata/modules/theme/static/scss/cover.scss +++ b/hepdata/modules/theme/static/scss/cover.scss @@ -1,18 +1,18 @@ -// This file is part of Zenodo. +// This file is part of HEPData. // Copyright (C) 2015 CERN. // -// Zenodo is free software; you can redistribute it +// HEPData is free software; you can redistribute it // and/or modify it under the terms of the GNU General Public License as // published by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version. // -// Zenodo is distributed in the hope that it will be +// HEPData is distributed in the hope that it will be // useful, but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with Zenodo; if not, write to the +// along with HEPData; if not, write to the // Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, // MA 02111-1307, USA. // diff --git a/hepdata/modules/theme/static/scss/footer.scss b/hepdata/modules/theme/static/scss/footer.scss index 27ae5573..5189f9aa 100644 --- a/hepdata/modules/theme/static/scss/footer.scss +++ b/hepdata/modules/theme/static/scss/footer.scss @@ -1,18 +1,18 @@ -// This file is part of Zenodo. +// This file is part of HEPData. // Copyright (C) 2015 CERN. // -// Zenodo is free software; you can redistribute it +// HEPData is free software; you can redistribute it // and/or modify it under the terms of the GNU General Public License as // published by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version. // -// Zenodo is distributed in the hope that it will be +// HEPData is distributed in the hope that it will be // useful, but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with Zenodo; if not, write to the +// along with HEPData; if not, write to the // Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, // MA 02111-1307, USA. // diff --git a/hepdata/modules/theme/static/scss/frontpage.scss b/hepdata/modules/theme/static/scss/frontpage.scss index def77086..d0491a68 100644 --- a/hepdata/modules/theme/static/scss/frontpage.scss +++ b/hepdata/modules/theme/static/scss/frontpage.scss @@ -1,18 +1,18 @@ -// This file is part of Zenodo. +// This file is part of HEPData. // Copyright (C) 2015 CERN. // -// Zenodo is free software; you can redistribute it +// HEPData is free software; you can redistribute it // and/or modify it under the terms of the GNU General Public License as // published by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version. // -// Zenodo is distributed in the hope that it will be +// HEPData is distributed in the hope that it will be // useful, but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with Zenodo; if not, write to the +// along with HEPData; if not, write to the // Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, // MA 02111-1307, USA. // diff --git a/hepdata/modules/theme/static/scss/input-icon.scss b/hepdata/modules/theme/static/scss/input-icon.scss index b9974cb6..650c8f0e 100644 --- a/hepdata/modules/theme/static/scss/input-icon.scss +++ b/hepdata/modules/theme/static/scss/input-icon.scss @@ -1,18 +1,18 @@ -// This file is part of Zenodo. +// This file is part of HEPData. // Copyright (C) 2015 CERN. // -// Zenodo is free software; you can redistribute it +// HEPData is free software; you can redistribute it // and/or modify it under the terms of the GNU General Public License as // published by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version. // -// Zenodo is distributed in the hope that it will be +// HEPData is distributed in the hope that it will be // useful, but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with Zenodo; if not, write to the +// along with HEPData; if not, write to the // Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, // MA 02111-1307, USA. // diff --git a/hepdata/modules/theme/static/scss/navbar.scss b/hepdata/modules/theme/static/scss/navbar.scss index 2ff5cef2..77c5a362 100644 --- a/hepdata/modules/theme/static/scss/navbar.scss +++ b/hepdata/modules/theme/static/scss/navbar.scss @@ -1,18 +1,18 @@ -// This file is part of Zenodo. +// This file is part of HEPData. // Copyright (C) 2015 CERN. // -// Zenodo is free software; you can redistribute it +// HEPData is free software; you can redistribute it // and/or modify it under the terms of the GNU General Public License as // published by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version. // -// Zenodo is distributed in the hope that it will be +// HEPData is distributed in the hope that it will be // useful, but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with Zenodo; if not, write to the +// along with HEPData; if not, write to the // Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, // MA 02111-1307, USA. // diff --git a/hepdata/modules/theme/static/scss/record.scss b/hepdata/modules/theme/static/scss/record.scss index 26969439..8879885b 100644 --- a/hepdata/modules/theme/static/scss/record.scss +++ b/hepdata/modules/theme/static/scss/record.scss @@ -1,18 +1,18 @@ -// This file is part of Zenodo. +// This file is part of HEPData. // Copyright (C) 2015 CERN. // -// Zenodo is free software; you can redistribute it +// HEPData is free software; you can redistribute it // and/or modify it under the terms of the GNU General Public License as // published by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version. // -// Zenodo is distributed in the hope that it will be +// HEPData is distributed in the hope that it will be // useful, but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with Zenodo; if not, write to the +// along with HEPData; if not, write to the // Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, // MA 02111-1307, USA. // diff --git a/hepdata/modules/theme/static/scss/sidebarnav.scss b/hepdata/modules/theme/static/scss/sidebarnav.scss index 1b95f86a..909604ff 100644 --- a/hepdata/modules/theme/static/scss/sidebarnav.scss +++ b/hepdata/modules/theme/static/scss/sidebarnav.scss @@ -1,18 +1,18 @@ -// This file is part of Zenodo. +// This file is part of HEPData. // Copyright (C) 2015 CERN. // -// Zenodo is free software; you can redistribute it +// HEPData is free software; you can redistribute it // and/or modify it under the terms of the GNU General Public License as // published by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version. // -// Zenodo is distributed in the hope that it will be +// HEPData is distributed in the hope that it will be // useful, but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with Zenodo; if not, write to the +// along with HEPData; if not, write to the // Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, // MA 02111-1307, USA. // diff --git a/hepdata/modules/theme/static/scss/styles.scss b/hepdata/modules/theme/static/scss/styles.scss index b06f88e6..d0174f32 100644 --- a/hepdata/modules/theme/static/scss/styles.scss +++ b/hepdata/modules/theme/static/scss/styles.scss @@ -1,18 +1,18 @@ -// This file is part of Zenodo. +// This file is part of HEPData. // Copyright (C) 2015 CERN. // -// Zenodo is free software; you can redistribute it +// HEPData is free software; you can redistribute it // and/or modify it under the terms of the GNU General Public License as // published by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version. // -// Zenodo is distributed in the hope that it will be +// HEPData is distributed in the hope that it will be // useful, but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with Zenodo; if not, write to the +// along with HEPData; if not, write to the // Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, // MA 02111-1307, USA. // diff --git a/hepdata/modules/theme/static/scss/type.scss b/hepdata/modules/theme/static/scss/type.scss index 5284ce6f..659396cd 100644 --- a/hepdata/modules/theme/static/scss/type.scss +++ b/hepdata/modules/theme/static/scss/type.scss @@ -1,18 +1,18 @@ -// This file is part of Zenodo. +// This file is part of HEPData. // Copyright (C) 2015 CERN. // -// Zenodo is free software; you can redistribute it +// HEPData is free software; you can redistribute it // and/or modify it under the terms of the GNU General Public License as // published by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version. // -// Zenodo is distributed in the hope that it will be +// HEPData is distributed in the hope that it will be // useful, but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with Zenodo; if not, write to the +// along with HEPData; if not, write to the // Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, // MA 02111-1307, USA. // diff --git a/hepdata/modules/theme/static/scss/utilities.scss b/hepdata/modules/theme/static/scss/utilities.scss index a6454efc..d7b28e34 100644 --- a/hepdata/modules/theme/static/scss/utilities.scss +++ b/hepdata/modules/theme/static/scss/utilities.scss @@ -1,18 +1,18 @@ -// This file is part of Zenodo. +// This file is part of HEPData. // Copyright (C) 2015 CERN. // -// Zenodo is free software; you can redistribute it +// HEPData is free software; you can redistribute it // and/or modify it under the terms of the GNU General Public License as // published by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version. // -// Zenodo is distributed in the hope that it will be +// HEPData is distributed in the hope that it will be // useful, but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with Zenodo; if not, write to the +// along with HEPData; if not, write to the // Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, // MA 02111-1307, USA. // diff --git a/hepdata/modules/theme/static/scss/variables.scss b/hepdata/modules/theme/static/scss/variables.scss index f67fb5b0..9bae8862 100644 --- a/hepdata/modules/theme/static/scss/variables.scss +++ b/hepdata/modules/theme/static/scss/variables.scss @@ -1,18 +1,18 @@ -// This file is part of Zenodo. +// This file is part of HEPData. // Copyright (C) 2015 CERN. // -// Zenodo is free software; you can redistribute it +// HEPData is free software; you can redistribute it // and/or modify it under the terms of the GNU General Public License as // published by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version. // -// Zenodo is distributed in the hope that it will be +// HEPData is distributed in the hope that it will be // useful, but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with Zenodo; if not, write to the +// along with HEPData; if not, write to the // Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, // MA 02111-1307, USA. // diff --git a/hepdata/modules/theme/templates/hepdata_theme/javascript.html b/hepdata/modules/theme/templates/hepdata_theme/javascript.html index 5f348799..7b40a8c1 100644 --- a/hepdata/modules/theme/templates/hepdata_theme/javascript.html +++ b/hepdata/modules/theme/templates/hepdata_theme/javascript.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/theme/templates/hepdata_theme/page.html b/hepdata/modules/theme/templates/hepdata_theme/page.html index 2989865d..f0aaa409 100644 --- a/hepdata/modules/theme/templates/hepdata_theme/page.html +++ b/hepdata/modules/theme/templates/hepdata_theme/page.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/theme/templates/hepdata_theme/page_cover.html b/hepdata/modules/theme/templates/hepdata_theme/page_cover.html index a55ff14a..8f4950bf 100644 --- a/hepdata/modules/theme/templates/hepdata_theme/page_cover.html +++ b/hepdata/modules/theme/templates/hepdata_theme/page_cover.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/theme/templates/hepdata_theme/security/login_user.html b/hepdata/modules/theme/templates/hepdata_theme/security/login_user.html index 25757717..23b108be 100644 --- a/hepdata/modules/theme/templates/hepdata_theme/security/login_user.html +++ b/hepdata/modules/theme/templates/hepdata_theme/security/login_user.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/theme/templates/hepdata_theme/security/register_user.html b/hepdata/modules/theme/templates/hepdata_theme/security/register_user.html index 2ce5aac2..f151f9cc 100644 --- a/hepdata/modules/theme/templates/hepdata_theme/security/register_user.html +++ b/hepdata/modules/theme/templates/hepdata_theme/security/register_user.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/theme/templates/hepdata_theme/settings/base.html b/hepdata/modules/theme/templates/hepdata_theme/settings/base.html index 4f8934c5..198dbb5b 100644 --- a/hepdata/modules/theme/templates/hepdata_theme/settings/base.html +++ b/hepdata/modules/theme/templates/hepdata_theme/settings/base.html @@ -1,19 +1,19 @@ {# -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/modules/theme/views.py b/hepdata/modules/theme/views.py index ed64361e..bb51dfd8 100644 --- a/hepdata/modules/theme/views.py +++ b/hepdata/modules/theme/views.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/hepdata/version.py b/hepdata/version.py index d0cf90b4..9ce54c79 100644 --- a/hepdata/version.py +++ b/hepdata/version.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,9 +22,9 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""Version information for Zenodo. +"""Version information for HEPData. -This file is imported by ``zenodo.__init__``, +This file is imported by ``HEPData.__init__``, and parsed by ``setup.py``. """ diff --git a/hepdata/wsgi.py b/hepdata/wsgi.py index ed8bd352..8f58d132 100644 --- a/hepdata/wsgi.py +++ b/hepdata/wsgi.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,7 +22,7 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""Zenodo WSGI application.""" +"""HEPData WSGI application.""" from __future__ import absolute_import, print_function diff --git a/pytest.ini b/pytest.ini index c495be1c..533f3c4f 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/setup.py b/setup.py index d1188843..03420f0c 100644 --- a/setup.py +++ b/setup.py @@ -159,6 +159,10 @@ def run_tests(self): 'invenio_base.apps': [ 'hepdata_records = hepdata.modules.records.ext:HEPDataRecords' ], + + 'invenio_db.models': [ + 'hepdata_records = hepdata.modules.records.models', + ], 'invenio_base.blueprints': [ 'hepdata_frontpage = hepdata.modules.frontpage.views:blueprint', 'hepdata_theme = hepdata.modules.theme.views:blueprint', diff --git a/tests/conftest.py b/tests/conftest.py index f3fc4e31..743ef106 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # diff --git a/tests/test_hepdata.py b/tests/test_hepdata.py index 728fa047..7356de9c 100644 --- a/tests/test_hepdata.py +++ b/tests/test_hepdata.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- # -# This file is part of Zenodo. +# This file is part of HEPData. # Copyright (C) 2015 CERN. # -# Zenodo is free software; you can redistribute it +# HEPData is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. # -# Zenodo is distributed in the hope that it will be +# HEPData is distributed in the hope that it will be # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Zenodo; if not, write to the +# along with HEPData; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. # @@ -22,7 +22,7 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. -"""Zenodo module test cases.""" +"""HEPData module test cases.""" from __future__ import absolute_import, print_function