diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 7b99365..dfc9ae3 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -2,9 +2,9 @@ name: Build Documentation on: push: - branches: [main, develop] + branches: [main, master, develop] pull_request: - branches: [main, develop] + branches: [main, master, develop] workflow_dispatch: permissions: @@ -44,7 +44,7 @@ jobs: path: docs/_build/html deploy: - if: github.ref == 'refs/heads/main' && github.event_name == 'push' + if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') && github.event_name == 'push' needs: build runs-on: ubuntu-latest environment: diff --git a/README.md b/README.md index 2e840ad..8d0f9e3 100644 --- a/README.md +++ b/README.md @@ -2,20 +2,26 @@ Python client library that abstracts [MAAP API](https://github.com/MAAP-Project/maap-api) calls including CMR querying, algorithm change management, and HySDS job execution. CMR components in this library are largely derived from the [pyCMR](https://github.com/nasa/pyCMR) library. -## Setup +## Installation -Run: +### From PyPI (recommended) ```bash -python setup.py install +pip install maap-py ``` -Or +### For development ```bash pip install -e . ``` +### Legacy + +```bash +python setup.py install +``` + ## Usage Populate your MAAP base url into a `maap.cfg` file, using [maap.cfg](maap.cfg) as a template.