Skip to content

Commit 2fbe9d4

Browse files
authored
Merge pull request #81 from podaac/develop
Release 1.10.0 release
2 parents 9fb5dc9 + a89a555 commit 2fbe9d4

8 files changed

+106
-13
lines changed

.github/workflows/python-app.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
python-version: [ "3.8", "3.9", "3.10" ]
17+
python-version: [ "3.7", "3.8", "3.9", "3.10" ]
1818
poetry-version: [ "1.1" ]
1919
os: [ ubuntu-18.04, macos-latest, windows-latest ]
2020
runs-on: ${{ matrix.os }}

.github/workflows/release.yml

+36-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v2
16-
- name: Set up Python 3.9
16+
- name: Set up Python 3.10
1717
uses: actions/setup-python@v2
1818
with:
1919
python-version: '3.10'
@@ -27,8 +27,43 @@ jobs:
2727
- name: build
2828
run: |
2929
poetry build
30+
- name: Get version
31+
id: get-version
32+
run: |
33+
echo "::set-output name=current_version::$(poetry version | awk '{print $2}')"
3034
- name: Publish a Python distribution to PyPI
3135
uses: pypa/gh-action-pypi-publish@release/v1
3236
with:
3337
user: __token__
3438
password: ${{ secrets.PYPI_API_TOKEN }}
39+
outputs:
40+
publishedVersion: ${{ steps.get-version.outputs.current_version }}
41+
verify:
42+
needs: release
43+
strategy:
44+
fail-fast: false
45+
matrix:
46+
python-version: [ "3.7", "3.8", "3.9", "3.10" ]
47+
os: [ ubuntu-18.04, macos-latest, windows-latest ]
48+
runs-on: ${{ matrix.os }}
49+
steps:
50+
- name: Set up Python
51+
uses: actions/setup-python@v2
52+
with:
53+
python-version: ${{ matrix.python-version }}
54+
- name: Install with pip
55+
shell: bash
56+
run: |
57+
python -m pip install --upgrade pip
58+
59+
# Retry 3 times before the steps actually fails because sometimes it takes a minute for pip to recognize the new version
60+
(echo "pip Install Attempt: 1" && pip install --force podaac-data-subscriber==${{ needs.release.outputs.publishedVersion }}) || \
61+
(echo "pip Install Attempt: 2" && pip install --force podaac-data-subscriber==${{ needs.release.outputs.publishedVersion }}) || \
62+
(echo "pip Install Attempt: 3" && pip install --force podaac-data-subscriber==${{ needs.release.outputs.publishedVersion }}) || \
63+
(echo "pip Install Step Failed" && exit 1)
64+
- name: Print Subscriber Usage
65+
run: |
66+
podaac-data-subscriber -h
67+
- name: Print Downloader Usage
68+
run: |
69+
podaac-data-downloader -h

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
33

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

6+
## [1.10.0]
7+
### Changed
8+
- Changed minimum supported python version to 3.7, down from 3.8.
9+
610
## [1.9.1]
711
### Changed
812
- Switched to [poetry](https://python-poetry.org/) as the build tool for the project

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The subscriber is useful for users who need to continuously pull the latest data
2626

2727
## Installation
2828

29-
Both subscriber and download require Python >= 3.8.
29+
Both subscriber and downloader require Python >= 3.7.
3030

3131
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:
3232

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

54+
**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.
55+
5456
## Step 1: Get Earthdata Login
5557
This step is needed only if you dont have an Earthdata login already.
5658
https://urs.earthdata.nasa.gov/

dev-requirements.txt

-1
This file was deleted.

poetry.lock

+59-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "podaac-data-subscriber"
3-
version = "1.9.1"
3+
version = "1.10.0"
44
description = "PO.DAAC Data Subscriber Command Line Tool"
55
authors = ["PO.DAAC <[email protected]>"]
66
readme = "README.md"
@@ -12,7 +12,7 @@ packages = [
1212
]
1313

1414
[tool.poetry.dependencies]
15-
python = "^3.8"
15+
python = "^3.7"
1616
requests = "^2.27.1"
1717
tenacity = "^8.0.1"
1818

subscriber/podaac_access.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import tenacity
2222
from datetime import datetime
2323

24-
__version__ = "1.9.1"
24+
__version__ = "1.10.0"
2525
extensions = [".nc", ".h5", ".zip", ".tar.gz"]
2626
edl = "urs.earthdata.nasa.gov"
2727
cmr = "cmr.earthdata.nasa.gov"

0 commit comments

Comments
 (0)