Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion package/debian10/control
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ Depends: ${misc:Depends},
python3-numpy,
python3-matplotlib,
python3-scipy,
python3-six,
python3-pyfai
# Recommends:
# Suggests: python3-rfoo
Expand Down
1 change: 0 additions & 1 deletion package/debian11/control
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ Depends: ${misc:Depends},
python3-numpy,
python3-matplotlib,
python3-scipy,
python3-six,
python3-pyfai
# Recommends:
# Suggests: python3-rfoo
Expand Down
1 change: 0 additions & 1 deletion package/debian12/control
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ Depends: ${misc:Depends},
python3-numpy,
python3-matplotlib,
python3-scipy,
python3-six,
python3-pyfai
# Recommends:
# Suggests: python3-rfoo
Expand Down
1 change: 0 additions & 1 deletion package/debian9/control
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ Depends: ${misc:Depends},
python3-numpy,
python3-matplotlib,
python3-scipy,
python3-six,
# Recommends:
# Suggests: python3-rfoo
Description: Free tools for small angle scattering analysis - Python3
Expand Down
2 changes: 1 addition & 1 deletion src/freesas/cormap.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from ._cormap import measure_longest


class LongestRunOfHeads(object):
class LongestRunOfHeads:
"""Implements the "longest run of heads" by Mark F. Schilling
The College Mathematics Journal, Vol. 21, No. 3, (1990), pp. 196-207
http://www.silx.org/pub/freesas/CorMap_math.pdf
Expand Down
4 changes: 1 addition & 3 deletions src/freesas/model.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python
# coding: utf-8
from __future__ import print_function

__author__ = "Guillaume"
__license__ = "MIT"
Expand All @@ -9,7 +8,6 @@
import os
from math import sqrt
import threading
import six
import numpy
try:
from . import _distance
Expand Down Expand Up @@ -42,7 +40,7 @@ def __init__(self, molecule=None):
"""
:param molecule: if str, name of a pdb file, else if 2d-array, coordinates of atoms of a molecule
"""
if isinstance(molecule, (six.text_type, six.binary_type)) and os.path.exists(molecule):
if isinstance(molecule, (str, bytes)) and os.path.exists(molecule):
self.read(molecule)
else:
self.atoms = molecule if molecule is not None else [] # initial coordinates of each dummy atoms of the molecule, fourth column full of one for the transformation matrix
Expand Down
1 change: 0 additions & 1 deletion src/freesas/test/test_align.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/python
from __future__ import print_function

__author__ = "Guillaume"
__license__ = "MIT"
Expand Down
1 change: 0 additions & 1 deletion src/freesas/test/test_all.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python
# coding: utf-8
from __future__ import print_function

__author__ = "Guillaume"
__license__ = "MIT"
Expand Down
1 change: 0 additions & 1 deletion src/freesas/test/test_average.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/python
# coding: utf-8
from __future__ import print_function

__author__ = "Guillaume"
__license__ = "MIT"
Expand Down
1 change: 0 additions & 1 deletion src/freesas/test/test_cormap.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/python
# coding: utf-8
from __future__ import print_function

__author__ = "Jerome"
__license__ = "MIT"
Expand Down
1 change: 0 additions & 1 deletion src/freesas/test/test_distance.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from __future__ import print_function

__author__ = "Jérôme Kieffer"
__license__ = "MIT"
Expand Down
1 change: 0 additions & 1 deletion src/freesas/test/test_model.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python
# coding: utf-8
from __future__ import print_function

__author__ = "Guillaume"
__license__ = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion src/freesas/test/utilstest.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def get_datafile(name):
def clean():
pass

class TestOptions(object):
class TestOptions:
"""
Class providing useful stuff for preparing tests.
"""
Expand Down
4 changes: 1 addition & 3 deletions src/freesas/transformations.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,6 @@

"""

from __future__ import division, print_function

import math

import numpy
Expand Down Expand Up @@ -1503,7 +1501,7 @@ def random_rotation_matrix(rand=None):
return quaternion_matrix(random_quaternion(rand))


class Arcball(object):
class Arcball:
"""Virtual Trackball Control.

>>> ball = Arcball()
Expand Down
Loading