Merge pull request #17 from jacquerie/fix-build

global: fix and simplify build

.travis.yml

@@ -1,67 +1,58 @@
 # -*- coding: utf-8 -*-
 #
-# This file is part of Invenio.
-# Copyright (C) 2017 CERN.
+# This file is part of INSPIRE.
+# Copyright (C) 2014-2017 CERN.
 #
-# Invenio 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.
+# INSPIRE 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 3 of the License, or
+# (at your option) any later version.
 #
-# Invenio 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.
+# INSPIRE 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 Invenio; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307, USA.
+# along with INSPIRE. If not, see <http://www.gnu.org/licenses/>.
 #
-# In applying this license, CERN does not
-# waive the privileges and immunities granted to it by virtue of its status
-# as an Intergovernmental Organization or submit itself to any jurisdiction.
+# In applying this license, CERN does not waive the privileges and immunities
+# granted to it by virtue of its status as an Intergovernmental Organization
+# or submit itself to any jurisdiction.
 
 notifications:
   email: false
 
-sudo: false
-
 language: python
 
+cache: pip
+
 matrix:
   fast_finish: true
 
-cache:
-  - pip
-
-env:
-  - REQUIREMENTS=devel
-
 python:
-  - "2.7"
-  - "3.5"
+  - 2.7
+  - 3.6
 
 before_install:
-  - "nvm install 6; nvm use 6"
-  - "travis_retry pip install --upgrade pip setuptools py"
-  - "travis_retry pip install twine wheel coveralls"
+  - travis_retry pip install --upgrade pip setuptools
+  - travis_retry pip install coveralls
 
 install:
-  - "travis_retry pip install -e .[all]"
+  - travis_retry pip install -e .[tests]
 
 script:
-  - "./run-tests.sh"
+  - py.test inspire_json_merger tests
 
 after_success:
   - coveralls
 
 deploy:
   provider: pypi
   user: inspirehep
-  distribution: sdist
   password:
     secure: "k7hKkmEEKinLBXIIHVPxgRaKhZlKfi6aLSZbv0Mx37nc14r+6JKxXTRWJG554y6cove+K6qbB8WXVkmGm96Q34UtVnnLhOi8lwRuPGa2eZRG/juMhe6KLfNi4jjcDylY2H18zcTuI83a5YLLHPT7JouwL6xWawe5TsYmB9eF0d2yoO5CKpeNAtG40uVcvjk1WL1MDwOUsddp0xS28aopWfD93VO2RDaVOKRe7PLa8AFNgHXgceK/wtfyI1g8FauFH2HY4Fh+XU8xrktvYgLNgrnerM62VkaSNrHXhDRV8KtucGU3s+xT/gRRLqRs7n6y+Q33pQOyAMbswu/qfodw6JTtkwYOaTg2zxvE/0Qajdvggmqr5MVDceAoA5y3s6uMmU9qR8iS7N4oAh3j1BAjPVWUd8Cv9a5xav1POUiF3DZP8Da0ffYh8uqgQfJr0IXdEoC3UWOWFOQuFaPu4d/f4dpvkEFcWuuYrAVm9nL31vP7YtsXRbNqnjqfnEoxOpHweR086btH8951j/AbxI5aunrfxeztahZbhfRQHphOsBj7S8aum+n/22zTqGejbP0oQBCPapkCdYJnBP71vGhshJLKyADvBWY9qqhWR8cZoPGfRH9lXGKAmJb8hap7lGnJfYhstQ/HsjOxwm1mc5JbaQuBoPMhkz8PwKWcddlTTXI="
   on:
     branch: master
-    python: '2.7'
+    python: 2.7
+  distribution: sdist

inspire_json_merger/utils/filterout_utils.py

@@ -117,21 +117,21 @@ def delete_from_nested_dict(obj, keys_path):
     Example:
 
         >>> obj = {
-            'authors': [
-                {
-                    'uuid': '160b80bf-7553-47f0-b40b-327e28e7756c',
-                    'full_name': 'Sempronio',
-                },
-                {
-                    'uuid': '160b80bf-7553-47f0-b40b-327e28e7756c',
-                    'full_name': 'Tizio Caio',
-                },
-            ]
-        }
-
+        ...     'authors': [
+        ...         {
+        ...             'full_name': 'Sempronio',
+        ...             'uuid': '160b80bf-7553-47f0-b40b-327e28e7756c',
+        ...         },
+        ...         {
+        ...             'full_name': 'Tizio Caio',
+        ...             'uuid': '160b80bf-7553-47f0-b40b-327e28e7756c',
+        ...         },
+        ...     ]
+        ... }
         >>> delete_from_nested_dict(obj, ['authors', 'full_name'])
         >>> 'full_name' not in obj['authors'][0]
         True
+
     """
     if not obj or not keys_path or len(keys_path) is 0:
         return

setup.py

@@ -102,7 +102,7 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Development Status :: 1 - Planning',
     ],
 )