Skip to content

Commit

Permalink
Merge pull request #81 from podaac/develop
Browse files Browse the repository at this point in the history
Release 1.10.0 release
  • Loading branch information
mike-gangl authored May 23, 2022
2 parents 9fb5dc9 + a89a555 commit 2fbe9d4
Show file tree
Hide file tree
Showing 8 changed files with 106 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.8", "3.9", "3.10" ]
python-version: [ "3.7", "3.8", "3.9", "3.10" ]
poetry-version: [ "1.1" ]
os: [ ubuntu-18.04, macos-latest, windows-latest ]
runs-on: ${{ matrix.os }}
Expand Down
37 changes: 36 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v2
with:
python-version: '3.10'
Expand All @@ -27,8 +27,43 @@ jobs:
- name: build
run: |
poetry build
- name: Get version
id: get-version
run: |
echo "::set-output name=current_version::$(poetry version | awk '{print $2}')"
- name: Publish a Python distribution to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
outputs:
publishedVersion: ${{ steps.get-version.outputs.current_version }}
verify:
needs: release
strategy:
fail-fast: false
matrix:
python-version: [ "3.7", "3.8", "3.9", "3.10" ]
os: [ ubuntu-18.04, macos-latest, windows-latest ]
runs-on: ${{ matrix.os }}
steps:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install with pip
shell: bash
run: |
python -m pip install --upgrade pip
# Retry 3 times before the steps actually fails because sometimes it takes a minute for pip to recognize the new version
(echo "pip Install Attempt: 1" && pip install --force podaac-data-subscriber==${{ needs.release.outputs.publishedVersion }}) || \
(echo "pip Install Attempt: 2" && pip install --force podaac-data-subscriber==${{ needs.release.outputs.publishedVersion }}) || \
(echo "pip Install Attempt: 3" && pip install --force podaac-data-subscriber==${{ needs.release.outputs.publishedVersion }}) || \
(echo "pip Install Step Failed" && exit 1)
- name: Print Subscriber Usage
run: |
podaac-data-subscriber -h
- name: Print Downloader Usage
run: |
podaac-data-downloader -h
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

## [1.10.0]
### Changed
- Changed minimum supported python version to 3.7, down from 3.8.

## [1.9.1]
### Changed
- Switched to [poetry](https://python-poetry.org/) as the build tool for the project
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The subscriber is useful for users who need to continuously pull the latest data

## Installation

Both subscriber and download require Python >= 3.8.
Both subscriber and downloader require Python >= 3.7.

The subscriber and downloader scripts are available in the [pypi python repository](https://pypi.org/project/podaac-data-subscriber/), it can be installed via pip:

Expand All @@ -51,6 +51,8 @@ usage: PO.DAAC bulk-data downloader [-h] -c COLLECTION -d OUTPUTDIRECTORY [--cyc
...
```

**Note:** If after installation, the `podaac-data-subscriber` or `podaac-data-downloader` commands are not available, you may need to add the script location to the PATH. This could be due to a *User Install* of the python package, which is common on shared systems where python packages are installed for the user (not the system). See [Installing to the User Site](https://packaging.python.org/en/latest/tutorials/installing-packages/#installing-to-the-user-site) and [User Installs](https://pip.pypa.io/en/latest/user_guide/#user-installs) for more information on finding the location of installed scripts and adding them to the PATH.

## Step 1: Get Earthdata Login
This step is needed only if you dont have an Earthdata login already.
https://urs.earthdata.nasa.gov/
Expand Down
1 change: 0 additions & 1 deletion dev-requirements.txt

This file was deleted.

65 changes: 59 additions & 6 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "podaac-data-subscriber"
version = "1.9.1"
version = "1.10.0"
description = "PO.DAAC Data Subscriber Command Line Tool"
authors = ["PO.DAAC <[email protected]>"]
readme = "README.md"
Expand All @@ -12,7 +12,7 @@ packages = [
]

[tool.poetry.dependencies]
python = "^3.8"
python = "^3.7"
requests = "^2.27.1"
tenacity = "^8.0.1"

Expand Down
2 changes: 1 addition & 1 deletion subscriber/podaac_access.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import tenacity
from datetime import datetime

__version__ = "1.9.1"
__version__ = "1.10.0"
extensions = [".nc", ".h5", ".zip", ".tar.gz"]
edl = "urs.earthdata.nasa.gov"
cmr = "cmr.earthdata.nasa.gov"
Expand Down

0 comments on commit 2fbe9d4

Please sign in to comment.