From f0a5ef428b2cabb121b26a33e112a51cd541532f Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Sat, 4 May 2024 14:43:48 +0200 Subject: [PATCH] remove Python 2 crumbs --- .travis.yml | 6 +++--- debian/control | 2 +- pymusic/pymusic.pyx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3df3431..6789095 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,11 +37,11 @@ before_install: - sudo apt-get install -y devscripts build-essential # remove any obsolete libraries - sudo apt-get autoremove - - sudo apt-get install -y python-coverage python-nose python-setuptools - - sudo apt-get install -y python-mpi4py openmpi-bin openmpi-doc libopenmpi-dev python-all-dev + - sudo apt-get install -y python3-coverage python3-setuptools + - sudo apt-get install -y python3-mpi4py openmpi-bin openmpi-doc libopenmpi-dev python3-all-dev # Install pip and cython - wget https://bootstrap.pypa.io/get-pip.py - - sudo python get-pip.py + - sudo python3 get-pip.py - sudo pip install -U setuptools - pip install --user cython==0.23.4 diff --git a/debian/control b/debian/control index 832eacc..307f960 100644 --- a/debian/control +++ b/debian/control @@ -51,7 +51,7 @@ Description: Multi-Simulation Coordinator for MPI -- Runtime library Package: python3-music Architecture: any -Depends: python3-mpi4py, python3-six, ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} +Depends: python3-mpi4py, ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} Description: Multi-Simulation Coordinator for MPI -- Runtime library MUSIC allows spike events and continuous time series to be communicated between parallel applications within the same MPI job in diff --git a/pymusic/pymusic.pyx b/pymusic/pymusic.pyx index ac8a98b..64dd6dc 100644 --- a/pymusic/pymusic.pyx +++ b/pymusic/pymusic.pyx @@ -5,7 +5,7 @@ from libc.stdlib cimport malloc, free import mpi4py.MPI as MPI -from six.moves import cPickle as pickle +import pickle ###########################################################