espressomd · bors · Jul 25, 2019 · Jul 25, 2019 · Jul 25, 2019 · Jul 25, 2019
diff --git a/doc/doxygen/gen_doxyconfig.py b/doc/doxygen/gen_doxyconfig.py
@@ -19,7 +19,6 @@
 #
 # This script generates the file doxy-features
 #
-from __future__ import print_function
 import inspect
 import sys
 import os

diff --git a/doc/sphinx/visualization.rst b/doc/sphinx/visualization.rst
@@ -228,7 +228,6 @@ following code snippet demonstrates the visualization of the director property
 and individual settings for two particle types (requires the ``ROTATION``
 feature)::
 
-    from __future__ import print_function
     import numpy
     from espressomd import *
     from espressomd.visualization_opengl import *

diff --git a/doc/tutorials/01-lennard_jones/01-lennard_jones.ipynb b/doc/tutorials/01-lennard_jones/01-lennard_jones.ipynb
@@ -16,19 +16,18 @@
     "2. [Background](#Background)\n",
     "3. [The Lennard-Jones Potential](#The-Lennard-Jones-Potential)\n",
     "4. [Units](#Units)\n",
-    "5. [Python versions](#Python-versions)\n",
-    "6. [First steps](#First-steps)\n",
-    "7. [Overview of a simulation script](#Overview-of-a-simulation-script)\n",
+    "5. [First steps](#First-steps)\n",
+    "6. [Overview of a simulation script](#Overview-of-a-simulation-script)\n",
     "    1. [System setup](#System-setup)\n",
     "    2. [Choosing the thermodynamic ensemble, thermostat](#Choosing-the-thermodynamic-ensemble,-thermostat)\n",
     "    3. [Placing and accessing particles](#Placing-and-accessing-particles)\n",
     "    4. [Setting up non-bonded interactions](#Setting-up-non-bonded-interactions)\n",
     "    5. [Warmup](#Warmup)\n",
     "    6. [Integrating equations of motion and taking measurements](#Integrating-equations-of-motion-and-taking-measurements)\n",
     "    7. [Simple Error Estimation on Time Series Data](#Simple-Error-Estimation-on-Time-Series-Data)\n",
-    "8. [Exercises](#Exercises)\n",
+    "7. [Exercises](#Exercises)\n",
     "    1. [Binary Lennard-Jones Liquid](#Binary-Lennard-Jones-Liquid)\n",
-    "9. [References](#References)\n",
+    "8. [References](#References)\n",
     "    "
    ]
   },
@@ -92,24 +91,6 @@
     "words LJ units."
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## Python versions\n",
-    "\n",
-    "Espresso can be used both, with python 2 and python 3. In these tutorials, we use python 3 print syntax. If you are on python 2, issue the following command to activate it:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "from __future__ import print_function"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/doc/tutorials/02-charged_system/02-charged_system-1.ipynb b/doc/tutorials/02-charged_system/02-charged_system-1.ipynb
@@ -39,7 +39,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from __future__ import print_function\n",
     "from espressomd import System, electrostatics\n",
     "import espressomd\n",
     "import numpy\n",

diff --git a/doc/tutorials/02-charged_system/02-charged_system-2.ipynb b/doc/tutorials/02-charged_system/02-charged_system-2.ipynb
@@ -67,7 +67,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from __future__ import print_function\n",
     "from espressomd import System, electrostatics, electrostatic_extensions\n",
     "from espressomd.shapes import Wall\n",
     "import espressomd\n",

diff --git a/doc/tutorials/04-lattice_boltzmann/04-lattice_boltzmann_part3.ipynb b/doc/tutorials/04-lattice_boltzmann/04-lattice_boltzmann_part3.ipynb
@@ -57,7 +57,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from __future__ import print_function, division\n",
     "import espressomd\n",
     "espressomd.assert_features(['CUDA', 'LENNARD_JONES'])\n",
     "from espressomd import System, interactions, lb, polymer\n",

diff --git a/doc/tutorials/06-active_matter/EXERCISES/enhanced_diffusion.py b/doc/tutorials/06-active_matter/EXERCISES/enhanced_diffusion.py
@@ -23,8 +23,6 @@
 #                                                                              #
 ##########################################################################
 
-from __future__ import print_function
-
 import numpy as np
 import os
 import sys

diff --git a/doc/tutorials/06-active_matter/EXERCISES/flow_field.py b/doc/tutorials/06-active_matter/EXERCISES/flow_field.py
@@ -23,8 +23,6 @@
 #                                                                              #
 ##########################################################################
 
-from __future__ import print_function
-
 import numpy as np
 import os
 

diff --git a/doc/tutorials/06-active_matter/EXERCISES/rectification_geometry.py b/doc/tutorials/06-active_matter/EXERCISES/rectification_geometry.py
@@ -23,8 +23,6 @@
 #                                                                              #
 ##########################################################################
 
-from __future__ import print_function
-
 from math import cos, pi, sin
 import numpy as np
 import os

diff --git a/doc/tutorials/06-active_matter/EXERCISES/rectification_simulation.py b/doc/tutorials/06-active_matter/EXERCISES/rectification_simulation.py
@@ -23,8 +23,6 @@
 #                                                                              #
 ##########################################################################
 
-from __future__ import print_function
-
 from math import cos, pi, sin
 import numpy as np
 import os

diff --git a/doc/tutorials/06-active_matter/SOLUTIONS/enhanced_diffusion.py b/doc/tutorials/06-active_matter/SOLUTIONS/enhanced_diffusion.py
@@ -23,8 +23,6 @@
 #                                                                              #
 ##########################################################################
 
-from __future__ import print_function
-
 import numpy as np
 import os
 import sys

diff --git a/doc/tutorials/06-active_matter/SOLUTIONS/flow_field.py b/doc/tutorials/06-active_matter/SOLUTIONS/flow_field.py
@@ -23,8 +23,6 @@
 #                                                                              #
 ##########################################################################
 
-from __future__ import print_function
-
 import numpy as np
 import os
 import sys

diff --git a/doc/tutorials/06-active_matter/SOLUTIONS/rectification_geometry.py b/doc/tutorials/06-active_matter/SOLUTIONS/rectification_geometry.py
@@ -23,8 +23,6 @@
 #                                                                              #
 ##########################################################################
 
-from __future__ import print_function
-
 from math import cos, pi, sin
 import numpy as np
 import os

diff --git a/doc/tutorials/06-active_matter/SOLUTIONS/rectification_simulation.py b/doc/tutorials/06-active_matter/SOLUTIONS/rectification_simulation.py
@@ -23,8 +23,6 @@
 #                                                                              #
 ##########################################################################
 
-from __future__ import print_function
-
 from math import cos, pi, sin
 import numpy as np
 import os

diff --git a/doc/tutorials/08-visualization/08-visualization.ipynb b/doc/tutorials/08-visualization/08-visualization.ipynb
@@ -41,8 +41,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from __future__ import print_function\n",
-    "\n",
     "from matplotlib import pyplot\n",
     "import espressomd\n",
     "import numpy\n",

diff --git a/doc/tutorials/10-reaction_ensemble/scripts/RE_vs_cpH.py b/doc/tutorials/10-reaction_ensemble/scripts/RE_vs_cpH.py
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-from __future__ import division
 import numpy as np
 
 import espressomd

diff --git a/doc/tutorials/10-reaction_ensemble/scripts/RE_vs_cpH_poly.py b/doc/tutorials/10-reaction_ensemble/scripts/RE_vs_cpH_poly.py
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-from __future__ import division
 import numpy as np
 
 import espressomd

diff --git a/doc/tutorials/11-ferrofluid/11-ferrofluid_part1.ipynb b/doc/tutorials/11-ferrofluid/11-ferrofluid_part1.ipynb
@@ -16,8 +16,7 @@
     "2. [The Model](#The-Model)\n",
     "3. [Structure of this tutorial](#Structure-of-this-tutorial)\n",
     "4. [Compiling ESPResSo for this Tutorial](#Compiling-ESPResSo-for-this-Tutorial)\n",
-    "5. [Python Version](#Python-Version)\n",
-    "6. [A Monolayer-Ferrofluid System in ESPResSo](#A-Monolayer-Ferrofluid-System-in-ESPResSo)\n",
+    "5. [A Monolayer-Ferrofluid System in ESPResSo](#A-Monolayer-Ferrofluid-System-in-ESPResSo)\n",
     "    1. [Setup](#Setup)\n",
     "    2. [Sampling](#Sampling)\n",
     "    3. [Sampling with animation](#Sampling-with-animation)\n",
@@ -199,13 +198,6 @@
     "Please uncomment them in the <tt>myconfig.hpp<tt> and compile **ESPResSo** using this <tt>myconfig.hpp<tt>."
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## Python Version"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/doc/tutorials/11-ferrofluid/11-ferrofluid_part3.ipynb b/doc/tutorials/11-ferrofluid/11-ferrofluid_part3.ipynb
@@ -121,8 +121,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from __future__ import print_function\n",
-    "\n",
     "import espressomd\n",
     "espressomd.assert_features('DIPOLES', 'LENNARD_JONES')\n",
     "\n",

diff --git a/maintainer/benchmarks/lj.py b/maintainer/benchmarks/lj.py
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
 import os
 import sys
 import numpy as np

diff --git a/maintainer/benchmarks/p3m.py b/maintainer/benchmarks/p3m.py
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
 import os
 import sys
 import numpy as np

diff --git a/maintainer/check_features.py b/maintainer/check_features.py
@@ -18,7 +18,6 @@
 #
 # Check whether all features used in the code are defined
 #
-from __future__ import print_function
 import sys
 import os
 sys.path.append(os.path.join(sys.path[0], '..', 'config'))

diff --git a/maintainer/gh_post_docs_warnings.py b/maintainer/gh_post_docs_warnings.py
@@ -18,7 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
 import re
 import os
 import sys

diff --git a/maintainer/gh_post_style_patch.py b/maintainer/gh_post_style_patch.py
@@ -18,7 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
 import os
 import requests
 import subprocess

diff --git a/maintainer/git2changelog.py b/maintainer/git2changelog.py
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
 import string
 import re
 import os

diff --git a/samples/MDAnalysisIntegration.py b/samples/MDAnalysisIntegration.py
@@ -19,7 +19,6 @@
 """
 This example shows how to integrate MDAnalysis in ESPResSo
 """
-from __future__ import print_function
 import espressomd
 from espressomd import MDA_ESP
 import numpy as np

diff --git a/samples/billiard.py b/samples/billiard.py
@@ -18,7 +18,6 @@
 ESPResSo 8Ball billiard game.
 """
 
-from __future__ import print_function
 import numpy as np
 import math
 from threading import Thread

diff --git a/samples/bonds-tst.py b/samples/bonds-tst.py
@@ -18,7 +18,6 @@
 This sample demonstrates how new bonds can be added between particles and how existing bond between particles can be deleted.
 """
 
-from __future__ import print_function
 import espressomd
 from espressomd import assert_features
 

diff --git a/samples/cellsystem_test.py b/samples/cellsystem_test.py
@@ -19,7 +19,6 @@
 This sample sets up a polymer and tests the available cell systems.
 """
 
-from __future__ import print_function
 import time
 import numpy as np
 import espressomd

diff --git a/samples/chamber_game.py b/samples/chamber_game.py
@@ -18,7 +18,6 @@
 ESPResSo as a game engine.
 """
 
-from __future__ import print_function
 from threading import Thread
 import numpy as np
 import time

diff --git a/samples/constraints.py b/samples/constraints.py
@@ -19,7 +19,6 @@
 constraints.
 """
 
-from __future__ import print_function
 import espressomd
 
 # Check if necessary features have been compiled

diff --git a/samples/debye_hueckel.py b/samples/debye_hueckel.py
@@ -22,7 +22,6 @@
 Debye-Hueckel potential. The system is maintained at a constant temperature
 using a Langevin thermostat.
 """
-from __future__ import print_function
 import espressomd
 
 required_features = ["ELECTROSTATICS", "LENNARD_JONES"]

diff --git a/samples/diffusion_coefficient.py b/samples/diffusion_coefficient.py
@@ -21,7 +21,6 @@
 Observables/Correlators framework.
 """
 
-from __future__ import division, print_function
 import espressomd
 from espressomd.accumulators import Correlator
 from espressomd.observables import ParticlePositions, ParticleVelocities

diff --git a/samples/dpd.py b/samples/dpd.py
@@ -19,7 +19,6 @@
 varying density. The fluid is thermalized using a DPD thermostat.
 """
 
-from __future__ import print_function
 import espressomd
 
 required_features = ["DPD"]

diff --git a/samples/drude_bmimpf6.py b/samples/drude_bmimpf6.py
@@ -19,7 +19,6 @@
 ionic liquid BMIM PF6.
 """
 
-from __future__ import print_function
 import sys
 import time
 import os

diff --git a/samples/electrophoresis.py b/samples/electrophoresis.py
@@ -19,7 +19,6 @@
 """
 This sample simulates electrophoresis using P3M solver.
 """
-from __future__ import print_function
 import espressomd
 
 required_features = ["P3M", "EXTERNAL_FORCES", "LENNARD_JONES"]

diff --git a/samples/espresso_logo.py b/samples/espresso_logo.py
@@ -14,7 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
 import math
 import numpy as np
 

diff --git a/samples/grand_canonical.py b/samples/grand_canonical.py
@@ -19,7 +19,6 @@
 """
 This sample performs a grand canonical simulation of a salt solution.
 """
-from __future__ import print_function
 import numpy as np
 import sys
 

diff --git a/samples/immersed_boundary/addBending.py b/samples/immersed_boundary/addBending.py
@@ -14,7 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
 
 
 def AddBending(system, kb):

diff --git a/samples/immersed_boundary/addSoft.py b/samples/immersed_boundary/addSoft.py
@@ -14,7 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
 
 
 def AddSoft(system, comX, comY, comZ, k1, k2):

diff --git a/samples/lbf.py b/samples/lbf.py
@@ -20,8 +20,6 @@
 This samples sets up a Lattice-Boltzmann fluid and applies an external force
 density on it.
 """
-from __future__ import print_function
-
 import matplotlib.pyplot as plt
 import numpy as np
 import argparse