[hdf-compass] 199/295: Merge branch 'develop' of https://github.com/HDFGroup/hdf-compass into develop

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository hdf-compass.

commit cf74719d9571ba6a1f21c0781621bb139edeb960
Merge: 8eb402e 0b1a492
Author: unknown <ymuqun at HDF-XINSHI.ad.hdfgroup.org>
Date:   Tue Oct 27 11:45:21 2015 -0500

    Merge branch 'develop' of https://github.com/HDFGroup/hdf-compass into develop
    
    Conflicts:

 .gitignore                                         |  17 +-
 COPYING                                            |  53 ++--
 HDFCompass.1file.spec                              |   5 +-
 README.md                                          |  74 -----
 README.rst                                         |  91 ++++++
 .../HydroPro_Icons_Terms.txt                       |   0
 .../KDE_Oxygen_Icon_Set_Copyright_and_License.txt  |   0
 .../NumPy_Copyright_and_License.txt                |   0
 .../PyDAP_Copyright_and_License.txt                |   0
 .../PyInstaller_Copyrights_and_Licenses.txt        |   0
 .../Python_Copyright_and_License.txt               |   0
 .../h5py_Copyrights_and_Licenses.txt               |   0
 .../hydroffice_bag_Copyrights_and_Licenses.txt     |  40 +++
 .../matplotlib_Copyright_and_License.txt           |   0
 .../wxWidgets_Copyrights_and_Licenses.txt          |   0
 appveyor.yml                                       |  62 ++++
 data/hdf5/Download/download_data.py                |  41 ++-
 docs/Makefile                                      |  43 ++-
 docs/conf.py                                       |  94 ++++--
 docs/{index.rst => data_model.rst}                 |  38 +--
 docs/how_to_contribute.rst                         |   4 +
 docs/how_to_freeze.rst                             |   4 +
 docs/how_to_install.rst                            |   4 +
 docs/how_to_release.rst                            |  21 ++
 docs/how_to_use.rst                                |   4 +
 docs/index.rst                                     | 349 +++------------------
 COPYING => docs/license.rst                        | 122 ++++---
 docs/make.bat                                      | 263 ++++++++++++++++
 docs/requirements.rst                              |   4 +
 hdf_compass/array_model/model.py                   |  90 +++++-
 hdf_compass/asc_model/model.py                     |   6 +
 hdf_compass/bag_model/model.py                     |  21 +-
 hdf_compass/compass_model/__init__.py              |   2 +-
 hdf_compass/compass_model/model.py                 |  32 +-
 hdf_compass/compass_viewer/array/frame.py          |  45 +--
 hdf_compass/compass_viewer/container/frame.py      |  16 +-
 hdf_compass/compass_viewer/frame.py                |  38 +--
 .../icons/{compass_32.png => favicon_32.png}       | Bin
 .../icons/{compass_48.png => favicon_48.png}       | Bin
 hdf_compass/compass_viewer/icons/readme.txt        |   5 +-
 hdf_compass/compass_viewer/info.py                 |  39 ++-
 hdf_compass/compass_viewer/viewer.py               |  34 +-
 hdf_compass/hdf5_model/model.py                    |  88 +++++-
 hdf_compass/opendap_model/model.py                 |  29 +-
 hdf_compass/utils/__init__.py                      |   2 +-
 setup.cfg                                          |  20 ++
 setup.py                                           | 130 ++++++++
 setup.py2app.py                                    |   2 +-
 test/HDFCompassTestPlan.rst                        | 326 -------------------
 {test => tests}/HDFCompassTestLog.rst              |   0
 50 files changed, 1243 insertions(+), 1015 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hdf-compass.git