From 885a28ee792d487ce3e09bb1fbcdaf4bc0018499 Mon Sep 17 00:00:00 2001 From: Christophe Vandeplas Date: Fri, 19 Oct 2018 12:35:36 +0200 Subject: [PATCH 1/2] chg: python3 --- .travis.yml | 2 +- pymispgalaxies/__init__.py | 2 +- pymispgalaxies/api.py | 2 +- setup.py | 2 +- tests/tests.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e415f38..54054d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -language: python +language: python3 cache: pip diff --git a/pymispgalaxies/__init__.py b/pymispgalaxies/__init__.py index d6ca4a5..1f820e6 100644 --- a/pymispgalaxies/__init__.py +++ b/pymispgalaxies/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- from .api import Galaxies, Clusters, EncodeGalaxies, EncodeClusters, UnableToRevertMachinetag diff --git a/pymispgalaxies/api.py b/pymispgalaxies/api.py index 6918ea4..be635c8 100644 --- a/pymispgalaxies/api.py +++ b/pymispgalaxies/api.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import json diff --git a/setup.py b/setup.py index 27b325a..6397cb0 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- from setuptools import setup diff --git a/tests/tests.py b/tests/tests.py index d7f24e8..576702c 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -25,7 +25,7 @@ class TestPyMISPGalaxies(unittest.TestCase): count = Counter(all_searchable) for k, v in count.items(): if v != 1: - warnings.warn(f'Duplicate on {cluster.type}: {k}') + warnings.warn('Duplicate on {}: {}'.format(cluster.type, k)) def test_duplicates(self): has_duplicates = False From c9d7c13a15fcead3e4fcc357a85472fd48c63642 Mon Sep 17 00:00:00 2001 From: Christophe Vandeplas Date: Fri, 19 Oct 2018 13:29:42 +0200 Subject: [PATCH 2/2] fix: travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 54054d5..e415f38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -language: python3 +language: python cache: pip