Fix some Windows bugs and tweak docs

.github/workflows/pythonpackage.yml

@@ -5,9 +5,10 @@ on: [push]
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        os: [ubuntu-18.04, ubuntu-latest, macos-10.15, windows-2019]
         python-version: [3.6, 3.7, 3.8]
 
     steps:
@@ -32,10 +33,13 @@ jobs:
       env:
         CI_PROD_TOKEN: ${{ secrets.CI_PROD_TOKEN }}
         CI_DEV_TOKEN: ${{ secrets.CI_DEV_TOKEN }}
+      shell: bash
       run: |
         pip install pytest
         cd demos
         ../tests/make-config.sh
-        ADAM_CONFIG="$PWD/../tests/test-config.yaml" pytest ../tests \
-          --cov=adam \
-          --ignore=../tests/integration_tests
+        ADAM_CONFIG="$(pwd)/../tests/test-config.yaml" pytest ../tests --cov=adam --ignore=../tests/integration_tests
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v1
+      with:
+        fail_ci_if_error: true

.gitignore

@@ -17,3 +17,4 @@ venv/
 .DS_Store
 .idea/
 docsource/
+.coverage*

README.md

@@ -1,7 +1,7 @@
 #  ADAM Python SDK and Jupyter notebooks
 
 [![Python package](https://github.com/B612-Asteroid-Institute/adam_home/workflows/Python%20package/badge.svg)](https://github.com/B612-Asteroid-Institute/adam_home/actions?query=workflow%3A%22Python+package%22)
-[![Coverage Status](https://coveralls.io/repos/github/B612-Asteroid-Institute/adam/badge.svg?branch=master)](https://coveralls.io/github/B612-Asteroid-Institute/adam?branch=master)
+[![Coverage Status](https://codecov.io/gh/B612-Asteroid-Institute/adam_home)](https://codecov.io/gh/B612-Asteroid-Institute/adam_home)
 
 This repo contains the Python SDK (software development kit) and Jupyter notebooks for interacting with ADAM (Asteroid Decision, Analysis, and Mapping) API programmatically.
 

adam/__main__.py

@@ -72,8 +72,12 @@ def _do_login(name, url, no_browser):
         refresh_token = getpass("Token: ")
 
         if refresh_token:
-            curr_cfg = cm.get_config(name)
-            if not curr_cfg:
+            curr_cfg = None
+            try:
+                curr_cfg = cm.get_config(name)
+            except KeyError:
+                print(f'Environment {name} does not exist, creating it')
+            if curr_cfg is None:
                 curr_cfg = dict(url=url)
             curr_cfg['refresh_token'] = refresh_token
             cm.set_config(name, curr_cfg)

adam/config_manager.py

@@ -26,6 +26,8 @@ def _load_raw_config(config_file=None):
 
     Returns
     -------
+    str
+        The filename of the config
     dict
         De-serialized configuration in the form of nested dictionaries.
 
@@ -44,7 +46,7 @@ def _load_raw_config(config_file=None):
                 config_file = def_config_file
 
         if config_file is None:
-            return "", {}
+            return "", {'envs': {}}
 
     # Load the config file (if we have it)
     with open(config_file) as fp:
@@ -84,7 +86,12 @@ def _store_raw_config(data, config_file=None):
     fd = os.open(config_file_tmp, os.O_CREAT | os.O_WRONLY, mode=0o600)
     with open(fd, "w") as fp:
         yaml.dump(data, fp, indent=2)
-    os.rename(config_file_tmp, config_file)
+
+    try:
+        os.rename(config_file_tmp, config_file)
+    except WindowsError:
+        os.remove(config_file)
+        os.rename(config_file_tmp, config_file)
 
     return config_file
 

adam/opm_params.py

@@ -108,6 +108,7 @@ def __init__(self, params):
                     arg_of_pericenter_deg (float): Argument of pericenter (deg)
                     true_anomaly_deg (float): True anomaly (deg)
                     gm (float): Gravitational constant (km^3/s^2)
+            keplerian_covariance (list): lower triangular covariance matrix (21 elements)
 
             originator (str): responsible entity for run (default: 'ADAM_User')
             object_name (str): name of object (default: 'dummy')

conda-requirements.txt

@@ -1,7 +1,6 @@
 # conda development environment
 astroquery
 conda-build
-coveralls
 flake8
 jupyter
 matplotlib

recipe/conda_build_config.yaml

@@ -0,0 +1,2 @@
+numpy:
+  - 1.18

recipe/meta.yaml

@@ -35,6 +35,8 @@ test:
 build:
   noarch: python
   script: python setup.py install --single-version-externally-managed --record=record.txt
+  entry_points:
+    - adamctl = adam.__main__:main
 
 about:
   home: https://adam.asteroid-institute.org

requirements.txt

@@ -1,6 +1,5 @@
 # pip development environment
 astroquery
-coveralls
 flake8
 jupyter
 matplotlib