Merge pull request #40 from rstoneback/develop

Update Documentation and Testing

Author: rstoneback

.travis.yml

@@ -3,41 +3,63 @@ dist: xenial
 matrix:
   include:
     - python: 2.7
+      services: xvfb
     - python: 3.6
-    - python: 3.7
-    - python: 3.8
+      dist: xenial
+      services: xvfb
 
 addons:
   apt:
     packages:
     - gfortran
+    - libncurses5-dev
 
 before_install:
-  - pip install pytest-cov
+  - sudo apt-get update
+  # We do this conditionally because it saves us some downloading if the
+  # version is the same.
+  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
+      wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
+    else
+      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+    fi
+  - bash miniconda.sh -b -p $HOME/miniconda
+  - source "$HOME/miniconda/etc/profile.d/conda.sh"
+  - hash -r
+  - conda config --set always_yes True --set changeps1 False
+  - conda update -q conda
+  # Useful for debugging any issues with conda
+  - conda info -a
+  # Create conda test environment
+  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy requests beautifulsoup4 lxml netCDF4 h5py nose pytest-cov pytest-ordering coveralls future
+  - conda activate test-environment
+  # Install version limited packages
+  - conda install 'pandas>=0.23, <0.25'
+  - conda install 'xarray<0.15'
+  - conda install 'kiwisolver<1.2'
+  # Dependencies not available through conda, install through pip
+  - pip install madrigalWeb
+  - pip install PyForecastTools
+  - pip install pysatCDF >/dev/null
+  # Get latest coveralls from pip, not conda
   - pip install coveralls
-  - pip install future
-  - pip install 'pandas<0.25'
-  - pip install 'xarray<0.15'
-  # Install version specific packages for 2.7 and 3.5
-  - pip install matplotlib
+  # set up data directory
+  - mkdir /home/travis/build/pysatData
   - pip install apexpy
-  - pip install numpy
-  - pip install pysatCDF >/dev/null
+  
+  # Prepare modified pysat install
   - cd ..
+  - echo 'cloning pysat'
   - git clone https://github.com/pysat/pysat.git >/dev/null
-  - cd ./pysat          # set up data directory
+  - echo 'installing pysat'
+  - cd ./pysat
+  # install pysat
   - git checkout develop
-  - git pull origin develop
   - python setup.py install >/dev/null
-  - cd ..
-
-    # set up data directory
-  - mkdir /home/travis/build/pysatData
-  - python -c 'import pysat; pysat.utils.set_data_dir("/home/travis/build/pysatData")'
+  - cd ../OMMBV
 
 install:
   # install OMMBV
-  - cd ./OMMBV
   - python setup.py develop
 
 # command to run tests

CHANGELOG.md

@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.5.2] - 2020-06-04
+- Fixed bugs coupling the code repo to community services related to the name change from pysatMagvect to OMMBV
+
 ## [0.5.0] - 2020-02-01
 - Added community documents
 - Implemented new algorithm for basis vectors. First system valid for multipole fields.

CONTRIBUTING.md

@@ -8,13 +8,13 @@ contributions.
 Short version
 =============
 
-* Submit bug reports and feature requests at `GitHub <https://github.com/pysat/pysatMagVect/issues>`_
+* Submit bug reports and feature requests at `GitHub <https://github.com/rstoneback/OMMBV/issues>`_
 * Make pull requests to the ``develop`` branch
 
 Bug reports
 ===========
 
-When `reporting a bug <https://github.com/pysat/pysatMagVect/issues>`_ please
+When `reporting a bug <https://github.com/rstoneback/OMMBV/issues>`_ please
 include:
 
 * Your operating system name and version
@@ -25,7 +25,7 @@ Feature requests and feedback
 =============================
 
 The best way to send feedback is to file an issue at
-`GitHub <https://github.com/pysat/pysatMagVect/issues>`_.
+`GitHub <https://github.com/rstoneback/OMMBV/issues>`_.
 
 If you are proposing a feature:
 
@@ -39,7 +39,7 @@ Development
 
 To set up `pysat` for local development:
 
-1. `Fork pysat on GitHub <https://github.com/pysat/pysatMagVect/fork>`_.
+1. `Fork pysat on GitHub <https://github.com/rstoneback/OMMBV/fork>`_.
 2. Clone your fork locally::
 
     git clone git@github.com:your_name_here/pysatMagVect.git
@@ -49,7 +49,7 @@ To set up `pysat` for local development:
     git checkout -b name-of-your-bugfix-or-feature
 
    Now you can make your changes locally. Tests should be added to the
-   appropriately named file in ``pysatMagVect/tests``. 
+   appropriately named file in ``OMMBV/tests``. 
 
 4. When you're done making changes, run all the checks to ensure that nothing
    is broken on your local system::

OMMBV/_core.py

@@ -110,9 +110,10 @@ def geodetic_to_ecef(latitude, longitude, altitude):
 
     return x, y, z
 
-
-ecef_to_geodetic = OMMBV.fortran_coords.ecef_to_geodetic
-
+try:
+    ecef_to_geodetic = OMMBV.fortran_coords.ecef_to_geodetic
+except AttributeError:
+    print('Unable to use Fortran version of ecef_to_geodetic. Please check installation.')
 
 def python_ecef_to_geodetic(x, y, z, method=None):
     """Convert ECEF into Geodetic WGS84 coordinates

OMMBV/version.txt

@@ -1 +1 @@
-0.5.1
+0.5.2

docs/api.rst

@@ -2,8 +2,8 @@
 API
 ===
 
-.. automodule:: pysatMagVect._core
+.. automodule:: OMMBV._core
    :members:
 
-.. automodule:: pysatMagVect.satellite
+.. automodule:: OMMBV.satellite
    :members:

docs/conf.py

@@ -30,11 +30,12 @@ class Mock(MagicMock):
     def __getattr__(cls, name):
         return MagicMock()
 
-MOCK_MODULES = ['OMMBV.igrf', 'scipy', 'scipy.integrate', 'numpy', 'datetime', 'pysat']
+MOCK_MODULES = ['OMMBV.igrf', 'OMMBV.fortran_coords', 'OMMBV.fortran_coords.ecef_to_geodetic',
+                'scipy', 'scipy.integrate', 'numpy', 'datetime', 'pysat']
 sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
 
 #print sys.path
-import pysatMagVect
+import OMMBV
 #print pysat.__path__
 
 
@@ -87,9 +88,9 @@ def __getattr__(cls, name):
 # built documents.
 #
 # The short X.Y version.
-version = pysatMagVect.__version__[::-1].partition('.')[2][::-1]
+version = OMMBV.__version__[::-1].partition('.')[2][::-1]
 # The full version, including alpha/beta/rc tags.
-release = pysatMagVect.__version__
+release = OMMBV.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/index.rst

@@ -3,8 +3,8 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to pysatMagVect's documentation!
-========================================
+Welcome to OMMBV's documentation!
+=================================
 
 .. toctree::
    :maxdepth: 2