Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nipy/nipy
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: nipy/nipy
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: integration
Choose a head ref
  • 7 commits
  • 11 files changed
  • 1 contributor

Commits on Jan 15, 2018

  1. Merge branch 'parcel-buffer' into integration 

    * parcel-buffer:
  RF+BF: work round Windows not having longcomplex
  BF: use safe Python 2 / 3 check for number
  BF: fix various Windows errors
    @matthew-brett
    matthew-brett committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    60d7f14 View commit details
    Browse the repository at this point in the history

  2. Add build of intvol.pyx

    @matthew-brett
    matthew-brett committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    fc2cb3a View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into integration 

    * origin/master:
  NF: add flag to disable doctests
    @matthew-brett
    matthew-brett committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    21fd823 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'numpy-114-fixes' into integration 

    * numpy-114-fixes:
  MAINT: try fixing latex doc build error
  MAINT: Use sympy master for doc build
  TST: adapt nipy doctests to numpy 1.14
  NF: add np.allclose doctest modifier
  DOC: various docstring reformats
    @matthew-brett
    matthew-brett committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    0133dba View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main-master' into integration 

    * main-master:
  RF: rename without doctests option
    @matthew-brett
    matthew-brett committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    247da53 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main-master' into integration 

    * main-master:
  BF: oh dear - another fix for doctest omission
    @matthew-brett
    matthew-brett committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    8b99c93 View commit details
    Browse the repository at this point in the history

  7. Add appveyor file for daily build

    @matthew-brett
    matthew-brett committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    b3c94be View commit details
    Browse the repository at this point in the history
Loading