Skip to content

Commit

Permalink
Merge branch 'development' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
JessicaS11 authored Sep 16, 2024
2 parents 3a66402 + 1439669 commit 948b16b
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 17 deletions.
24 changes: 10 additions & 14 deletions .github/workflows/integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,29 @@ on:
push:
branches:
- "main" # Releases
- "development" # PR merges
- "development" # Feature PR merges
pull_request:
branches:
- "main" # Release pull requests
pull_request_review:
types:
- "submitted"
paths:
- ".github/**"
- "icepyx/**/*.py"
- "pyproject.toml"
- "requirements*.txt"
- "main" # Release PRs
workflow_dispatch:
inputs:
ref:
description: "The ref to test"
type: "string"


jobs:
test:
name: "Integration test"
# Job is conditional:
# - Do not run on PRs from forks
# - Do not run on `pull_request_review` events unless the PR is approved.
if: "${{ !github.event.pull_request.head.repo.fork && (github.event.action != 'pull_request_review' || github.event.review.state == 'approved') }}"
# Do not run on PRs from forks:
if: "${{ !github.event.pull_request.head.repo.fork }}"
runs-on: "ubuntu-latest"

steps:
- uses: "actions/checkout@v4"
with:
fetch-depth: 0
ref: "${{ inputs.ref }}"

- uses: "./.github/actions/install-icepyx"
with:
Expand Down
14 changes: 14 additions & 0 deletions icepyx/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
from warnings import warn

deprecation_msg = """icepyx v1.x is being deprecated; the back-end systems on which it relies
will be shut down as of late 2024. At that time, upgrade to icepyx v2.x, which uses the
new NASA Harmony back-end, will be required. Please see
<https://icepyx.readthedocs.io/en/latest/user_guide/changelog/v1.3.0.html> for more
information!
"""
# IMPORTANT: This is being done before the other icepyx imports because the imported
# code changes warning filters. If this is done after the imports, the warning won't
# work.
warn(deprecation_msg, FutureWarning, stacklevel=2)


from _icepyx_version import version as __version__

from icepyx.core.query import GenQuery, Query
Expand Down
4 changes: 1 addition & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description = "Python tools for obtaining and working with ICESat-2 data"
license = {file = "LICENSE"}
readme = "README.rst"

requires-python = "~=3.7"
requires-python = ">=3.9"
dynamic = ["version", "dependencies"]

authors = [
Expand All @@ -20,8 +20,6 @@ classifiers=[
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Expand Down

0 comments on commit 948b16b

Please sign in to comment.