WIP: Migrate to python3 🐍

.circleci/config.yml

@@ -4,7 +4,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: udata/circleci
+      - image: udata/circleci:py3
       - image: mongo:3.2
       - image: redis
       - image: udata/elasticsearch:2.4.5
@@ -36,7 +36,7 @@ jobs:
       - run:
           name: Install python dependencies
           command: |
-            virtualenv venv
+            virtualenv -ppython3.6 venv
             source venv/bin/activate
             # Workaround to bad transitive dependencies resolution:
             # Install package first then all other dependencies
@@ -85,7 +85,7 @@ jobs:
 
   publish:
     docker:
-      - image: udata/circleci
+      - image: udata/circleci:py3
     steps:
       - attach_workspace:
           at: .
@@ -98,7 +98,7 @@ jobs:
 
   github:
     docker:
-      - image: udata/circleci
+      - image: udata/circleci:py3
     environment:
        BASH_ENV: /root/.bashrc
     steps:

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## Current (in progress)
 
-- Nothing yet
+- Migrate to python3 🐍 [#68](https://github.com/opendatateam/udata-piwik/pull/68)
 
 ## 1.3.1 (2018-11-05)
 

requirements/install.pip

@@ -1 +1 @@
-udata>=1.6.1
+udata>=2.0.0.dev

setup.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 import io
 import os
 import re
@@ -102,7 +101,7 @@ def pip(filename):
 
 setup(
     name='udata-piwik',
-    version='1.3.2.dev',
+    version='2.0.0.dev',
     description='Piwik support for uData',
     long_description=long_description,
     url='https://github.com/opendatateam/udata-piwik',
@@ -137,8 +136,8 @@ def pip(filename):
         'Intended Audience :: Developers',
         'Topic :: System :: Software Distribution',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
 )

tasks.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals, absolute_import
-
 import os
 
 from invoke import task, call

tests/client.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from datetime import datetime
 
 import requests

tests/conftest.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import os
 
 from udata.settings import Testing

tests/test_commands.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import pytest
 
 from datetime import date, timedelta

tests/test_piwik.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import pytest
 
 from datetime import date, datetime, timedelta

udata_piwik/__init__.py

@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals

udata_piwik/client.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import logging
 import requests
 

udata_piwik/commands.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import logging
 
 import click

udata_piwik/counter.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import logging
 
 from werkzeug.exceptions import NotFound

udata_piwik/download_counter.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import logging
 import re
 import uuid

udata_piwik/metrics.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import itertools
 import logging
 
@@ -111,15 +108,15 @@ def aggregate_reuses_daily(org, day):
 
 def upsert_metric_for_day(obj, day, data):
     oid = obj.id if hasattr(obj, 'id') else obj
-    if not isinstance(day, basestring):
+    if not isinstance(day, str):
         day = (day or date.today()).isoformat()
     commands = dict(('inc__values__{0}'.format(k), data[k]) for k in KEYS)
     metrics = Metrics.objects(object_id=oid, level='daily', date=day)
     return metrics.update_one(upsert=True, **commands)
 
 
 def clear_metrics_for_day(day):
-    if not isinstance(day, basestring):
+    if not isinstance(day, str):
         day = (day or date.today()).isoformat()
     commands = dict(('unset__values__{0}'.format(k), 1) for k in KEYS)
     metrics = Metrics.objects(level='daily', date=day)

udata_piwik/tasks.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import logging
 from datetime import date, timedelta
 

udata_piwik/utils.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from datetime import date
 
 from flask import _app_ctx_stack
@@ -39,7 +36,7 @@ def route_from(url, method=None):
 
 def is_today(day):
     today = date.today()
-    if isinstance(day, basestring):
+    if isinstance(day, str):
         return day == today.isoformat()
     else:
         return day == today

udata_piwik/views.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from flask import render_template, Blueprint
 from jinja2 import contextfunction