Code

Single source Python 2 and 3#473

Code

Closed

pya wants to merge 8 commits intousnistgov:developusnistgov/fipy:developfrom pya:py34pya/fipy:py34Copy head branch name to clipboard

+4,298-3,296

Commits

Commits on Nov 8, 2015

• Modify doctest. Return value is True not 1 for numpy 1.10.1.

  pya

  committed
  5857986

  Copy full SHA for 5857986

• Fix concatenation of numpy arrays. axis=1 does not make sence for 1D arrays.

  Show description for fc44d06
  pya

  committed
  fc44d06

  Copy full SHA for fc44d06

• Automatic conversion with futurize from python-future.org.

  pya

  committed
  e4dd26a

  Copy full SHA for e4dd26a

• Fix unicode issues.

  pya

  committed
  910b24f

  Copy full SHA for 910b24f

• Fix all but one doctest. They pass with Python 2.7 and 3.4.

  pya

  committed
  394e104

  Copy full SHA for 394e104

• Formatting.

  pya

  committed
  b45dd97

  Copy full SHA for b45dd97

• Fix last test.

  pya

  committed
  732a4a7

  Copy full SHA for 732a4a7

• Add requirements.txt.

  pya

  committed
  444e8e0

  Copy full SHA for 444e8e0