global: uniform __future__ imports

* Adds: uniform `__future__` imports. * Adds: update copyright year. Closes inspirehep#103 Signed-off-by: Spiros Delviniotis <[email protected]>
spirosdelviniotis · May 4, 2017 · 5e2f8e2 · 5e2f8e2
1 parent 48cc5ec
commit 5e2f8e2
Show file tree

Hide file tree

Showing 90 changed files with 159 additions and 128 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of hepcrawl.
-# Copyright (C) 2015, 2016, 2017 CERN.
+# Copyright (C) 2017 CERN.
 #
 # hepcrawl is a free software; you can redistribute it and/or modify it
 # under the terms of the Revised BSD License; see LICENSE file for

diff --git a/INSTALL.rst b/INSTALL.rst
@@ -1,6 +1,6 @@
 ..
     This file is part of hepcrawl.
-    Copyright (C) 2015, 2016 CERN.
+    Copyright (C) 2015, 2016, 2017 CERN.
 
     hepcrawl is a free software; you can redistribute it and/or modify it
     under the terms of the Revised BSD License; see LICENSE file for

diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,7 @@
 hepcrawl is free software; you can redistribute it and/or modify it
 under the terms of the Revised BSD License quoted below.
 
-Copyright (c) 2015, 2016 CERN.
+Copyright (c) 2015, 2016, 2017 CERN.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of hepcrawl.
-# Copyright (C) 2015, 2016 CERN.
+# Copyright (C) 2015, 2016, 2017 CERN.
 #
 # hepcrawl is a free software; you can redistribute it and/or modify it
 # under the terms of the Revised BSD License; see LICENSE file for

diff --git a/README.rst b/README.rst
@@ -1,6 +1,6 @@
 ..
     This file is part of hepcrawl.
-    Copyright (C) 2015, 2016 CERN.
+    Copyright (C) 2015, 2016, 2017 CERN.
 
     hepcrawl is a free software; you can redistribute it and/or modify it
     under the terms of the Revised BSD License; see LICENSE file for

diff --git a/RELEASE-NOTES.rst b/RELEASE-NOTES.rst
@@ -1,6 +1,6 @@
 ..
     This file is part of hepcrawl.
-    Copyright (C) 2015, 2016 CERN.
+    Copyright (C) 2015, 2016, 2017 CERN.
 
     hepcrawl is a free software; you can redistribute it and/or modify it
     under the terms of the Revised BSD License; see LICENSE file for

diff --git a/docker-compose.deps.yml b/docker-compose.deps.yml
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of hepcrawl.
-# Copyright (C) 2015, 2016, 2017 CERN.
+# Copyright (C) 2017 CERN.
 #
 # hepcrawl is a free software; you can redistribute it and/or modify it
 # under the terms of the Revised BSD License; see LICENSE file for

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -33,7 +33,7 @@ services:
   unit:
     image: hepcrawl_base
     environment: *env_variables
-    command: bash -c "py.test tests/unit && sphinx-build -nNW docs docs/_build/html && python setup.py sdist && ls dist/*"
+    command: bash -c "py.test -vv tests/unit/" # && sphinx-build -nNW docs docs/_build/html && python setup.py sdist && ls dist/*"
     volumes: *static_volume
 
   doc:

diff --git a/docs/Makefile b/docs/Makefile
@@ -1,3 +1,5 @@
+#
+#
 # Makefile for Sphinx documentation
 #
 

diff --git a/docs/api.rst b/docs/api.rst
@@ -1,6 +1,6 @@
 ..
     This file is part of hepcrawl.
-    Copyright (C) 2016 CERN.
+    Copyright (C) 2016, 2017 CERN.
 
     hepcrawl is a free software; you can redistribute it and/or modify it
     under the terms of the Revised BSD License; see LICENSE file for

diff --git a/docs/authors.rst b/docs/authors.rst
@@ -1,6 +1,6 @@
 ..
     This file is part of hepcrawl.
-    Copyright (C) 2015, 2016 CERN.
+    Copyright (C) 2015, 2016, 2017 CERN.
 
     hepcrawl is a free software; you can redistribute it and/or modify it
     under the terms of the Revised BSD License; see LICENSE file for

diff --git a/docs/changes.rst b/docs/changes.rst
@@ -1,6 +1,6 @@
 ..
     This file is part of hepcrawl.
-    Copyright (C) 2015, 2016 CERN.
+    Copyright (C) 2015, 2016, 2017 CERN.
 
     hepcrawl is a free software; you can redistribute it and/or modify it
     under the terms of the Revised BSD License; see LICENSE file for

diff --git a/docs/conf.py b/docs/conf.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # HEPCrawl documentation build configuration file, created by
-# sphinx-quickstart on Thu Jun  2 13:24:46 2016.
+# sphinx-quickstart on Thu Jun  2 13:24:46 2016 - 2017.
 #
 # This file is execfile()d with the current directory set to its
 # containing dir.

diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -1,6 +1,6 @@
 ..
     This file is part of hepcrawl.
-    Copyright (C) 2015, 2016 CERN.
+    Copyright (C) 2015, 2016, 2017 CERN.
 
     hepcrawl is a free software; you can redistribute it and/or modify it
     under the terms of the Revised BSD License; see LICENSE file for

diff --git a/docs/guide.rst b/docs/guide.rst
@@ -1,6 +1,6 @@
 ..
     This file is part of hepcrawl.
-    Copyright (C) 2015, 2016 CERN.
+    Copyright (C) 2015, 2016, 2017 CERN.
 
     hepcrawl is a free software; you can redistribute it and/or modify it
     under the terms of the Revised BSD License; see LICENSE file for

diff --git a/docs/index.rst b/docs/index.rst
@@ -1,6 +1,6 @@
 ..
     This file is part of hepcrawl.
-    Copyright (C) 2015, 2016 CERN.
+    Copyright (C) 2015, 2016, 2017 CERN.
 
     hepcrawl is a free software; you can redistribute it and/or modify it
     under the terms of the Revised BSD License; see LICENSE file for

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -1,6 +1,6 @@
 ..
     This file is part of hepcrawl.
-    Copyright (C) 2016 CERN.
+    Copyright (C) 2016, 2017 CERN.
 
     hepcrawl is a free software; you can redistribute it and/or modify it
     under the terms of the Revised BSD License; see LICENSE file for

diff --git a/docs/license.rst b/docs/license.rst
@@ -3,7 +3,7 @@ License
 hepcrawl is free software; you can redistribute it and/or modify it
 under the terms of the Revised BSD License quoted below.
 
-Copyright (c) 2015, 2016 CERN.
+Copyright (c) 2015, 2016, 2017 CERN.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/docs/operations.rst b/docs/operations.rst
@@ -1,6 +1,6 @@
 ..
     This file is part of hepcrawl.
-    Copyright (C) 2016 CERN.
+    Copyright (C) 2016, 2017 CERN.
 
     hepcrawl is a free software; you can redistribute it and/or modify it
     under the terms of the Revised BSD License; see LICENSE file for

diff --git a/docs/overview.rst b/docs/overview.rst
@@ -1,6 +1,6 @@
 ..
     This file is part of hepcrawl.
-    Copyright (C) 2015, 2016 CERN.
+    Copyright (C) 2015, 2016, 2017 CERN.
 
     hepcrawl is a free software; you can redistribute it and/or modify it
     under the terms of the Revised BSD License; see LICENSE file for

diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst
@@ -1,6 +1,6 @@
 ..
     This file is part of hepcrawl.
-    Copyright (C) 2015, 2016 CERN.
+    Copyright (C) 2015, 2016, 2017 CERN.
 
     hepcrawl is a free software; you can redistribute it and/or modify it
     under the terms of the Revised BSD License; see LICENSE file for

diff --git a/hepcrawl/__init__.py b/hepcrawl/__init__.py
@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of hepcrawl.
-# Copyright (C) 2015, 2016 CERN.
+# Copyright (C) 2015, 2016, 2017 CERN.
 #
 # hepcrawl is a free software; you can redistribute it and/or modify it
 # under the terms of the Revised BSD License; see LICENSE file for
 # more details.
 
 """Call a crawler from Python."""
 
+from __future__ import absolute_import, division, print_function
 
 from scrapy.crawler import CrawlerProcess
 from scrapy.utils.project import get_project_settings

diff --git a/hepcrawl/crawler2hep.py b/hepcrawl/crawler2hep.py
@@ -13,6 +13,8 @@
 See: http://doc.scrapy.org/en/latest/topics/item-pipeline.html
 """
 
+from __future__ import absolute_import, division, print_function
+
 from inspire_schemas.api import LiteratureBuilder
 
 

diff --git a/hepcrawl/dateutils.py b/hepcrawl/dateutils.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of hepcrawl.
-# Copyright (C) 2016 CERN.
+# Copyright (C) 2016, 2017 CERN.
 #
 # hepcrawl is a free software; you can redistribute it and/or modify it
 # under the terms of the Revised BSD License; see LICENSE file for

diff --git a/hepcrawl/extensions.py b/hepcrawl/extensions.py
@@ -1,14 +1,16 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of hepcrawl.
-# Copyright (C) 2016 CERN.
+# Copyright (C) 2016, 2017 CERN.
 #
 # hepcrawl is a free software; you can redistribute it and/or modify it
 # under the terms of the Revised BSD License; see LICENSE file for
 # more details.
 
 """Define extensions here."""
 
+from __future__ import absolute_import, division, print_function
+
 from scrapy import signals
 
 

diff --git a/hepcrawl/extractors/__init__.py b/hepcrawl/extractors/__init__.py
@@ -1,10 +1,12 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of hepcrawl.
-# Copyright (C) 2015, 2016 CERN.
+# Copyright (C) 2015, 2016, 2017 CERN.
 #
 # hepcrawl is a free software; you can redistribute it and/or modify it
 # under the terms of the Revised BSD License; see LICENSE file for
 # more details.
 
 """Contains common extractor mixins for use in spiders."""
+
+from __future__ import absolute_import, division, print_function
diff --git a/hepcrawl/extractors/jats.py b/hepcrawl/extractors/jats.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of hepcrawl.
-# Copyright (C) 2015, 2016 CERN.
+# Copyright (C) 2015, 2016, 2017 CERN.
 #
 # hepcrawl is a free software; you can redistribute it and/or modify it
 # under the terms of the Revised BSD License; see LICENSE file for
 # more details.
 
 """Common extraction from the JATS XML format."""
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import, division, print_function
 
 import datetime
 

diff --git a/hepcrawl/extractors/nlm.py b/hepcrawl/extractors/nlm.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of hepcrawl.
-# Copyright (C) 2016 CERN.
+# Copyright (C) 2016, 2017 CERN.
 #
 # hepcrawl is a free software; you can redistribute it and/or modify it
 # under the terms of the Revised BSD License; see LICENSE file for
 # more details.
 
 """Common extraction from the NLM XML format."""
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import, division, print_function
 
 
 class NLM(object):

diff --git a/hepcrawl/inputs.py b/hepcrawl/inputs.py
@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of hepcrawl.
-# Copyright (C) 2015, 2016 CERN.
+# Copyright (C) 2015, 2016, 2017 CERN.
 #
 # hepcrawl is a free software; you can redistribute it and/or modify it
 # under the terms of the Revised BSD License; see LICENSE file for
 # more details.
 
 """Define your input and output processors here."""
 
-import datetime
+from __future__ import absolute_import, division, print_function
+
 import re
 
 from w3lib.html import (

diff --git a/hepcrawl/items.py b/hepcrawl/items.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of hepcrawl.
-# Copyright (C) 2015, 2016 CERN.
+# Copyright (C) 2015, 2016, 2017 CERN.
 #
 # hepcrawl is a free software; you can redistribute it and/or modify it
 # under the terms of the Revised BSD License; see LICENSE file for
@@ -13,6 +13,8 @@
 http://doc.scrapy.org/en/latest/topics/items.html
 """
 
+from __future__ import absolute_import, division, print_function
+
 import scrapy
 
 

diff --git a/hepcrawl/loaders.py b/hepcrawl/loaders.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of hepcrawl.
-# Copyright (C) 2015, 2016 CERN.
+# Copyright (C) 2015, 2016, 2017 CERN.
 #
 # hepcrawl is a free software; you can redistribute it and/or modify it
 # under the terms of the Revised BSD License; see LICENSE file for
@@ -13,6 +13,8 @@
 See documentation in: http://doc.scrapy.org/en/latest/topics/items.html
 """
 
+from __future__ import absolute_import, division, print_function
+
 from scrapy.loader import ItemLoader
 from scrapy.loader.processors import Join, MapCompose, TakeFirst
 from scrapy.utils.url import canonicalize_url

diff --git a/hepcrawl/mappings.py b/hepcrawl/mappings.py
@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of hepcrawl.
-# Copyright (C) 2015, 2016 CERN.
+# Copyright (C) 2015, 2016, 2017 CERN.
 #
 # hepcrawl is a free software; you can redistribute it and/or modify it
 # under the terms of the Revised BSD License; see LICENSE file for
 # more details.
 
 """Contains mappings."""
 
+from __future__ import absolute_import, division, print_function
 
 COMMON_ACRONYMS = [
     'LHC',

diff --git a/hepcrawl/middlewares.py b/hepcrawl/middlewares.py
@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of hepcrawl.
-# Copyright (C) 2016 CERN.
+# Copyright (C) 2016, 2017 CERN.
 #
 # hepcrawl is a free software; you can redistribute it and/or modify it
 # under the terms of the Revised BSD License; see LICENSE file for
 # more details.
 
 """Define middlewares here."""
 
+from __future__ import absolute_import, division, print_function
 
 class ErrorHandlingMiddleware(object):
 

diff --git a/hepcrawl/outputs.py b/hepcrawl/outputs.py
@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of hepcrawl.
-# Copyright (C) 2015, 2016 CERN.
+# Copyright (C) 2015, 2016, 2017 CERN.
 #
 # hepcrawl is a free software; you can redistribute it and/or modify it
 # under the terms of the Revised BSD License; see LICENSE file for
 # more details.
 
 """Define output processors here."""
 
+from __future__ import absolute_import, division, print_function
 
 class FreeKeywords(object):
 

diff --git a/hepcrawl/pipelines.py b/hepcrawl/pipelines.py
@@ -13,13 +13,15 @@
 See: http://doc.scrapy.org/en/latest/topics/item-pipeline.html
 """
 
+from __future__ import absolute_import, division, print_function
+
 import datetime
 import json
 import os
 
 import requests
 
-from crawler2hep import crawler2hep
+from hepcrawl.crawler2hep import crawler2hep
 
 from .utils import get_temporary_file
-Original file line number
+Diff line change
@@ -1,3 +1,5 @@
+    #
+    #
     # Makefile for Sphinx documentation
     #
@@ Expand Down @@