Skip to content

Commit

Permalink
Merge pull request #354 from tonysohn/update_fgs_jframe_aperture
Browse files Browse the repository at this point in the history
Update FGS J-FRAME aperture following Oct 2024 FGS1-to-JFrame k-constants update
  • Loading branch information
Witchblade101 authored Oct 21, 2024
2 parents 255731c + 2539dd5 commit b386490
Show file tree
Hide file tree
Showing 12 changed files with 4,248 additions and 74 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: build

on:
release:
types: [ released ]
pull_request:
workflow_dispatch:

jobs:
build:
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1
with:
upload_to_pypi: ${{ (github.event_name == 'release') && (github.event.action == 'released') }}
secrets:
pypi_token: ${{ secrets.PYPI_PASSWORD_STSCI_MAINTAINER }}
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
cache-dependency-path: 'pyproject.toml'
- run: pip install ".[test]"
- run: pytest
- run: pip install setuptools
- run: pytest
17 changes: 0 additions & 17 deletions .github/workflows/publish-to-pypi.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ The following describes the typical work flow for contributing to the pysiaf pro
11. Delete your local copy of your branch.

### Installation
This package is supported in python 3.8 and 3.9
This package is supported in python 3.10+

`pip install pysiaf`

Expand Down
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ dependencies = [
"lxml>=4.6.4",
"matplotlib>=3.4.3",
"numpy>=1.21.4",
"numpydoc>=1.1.0",
"openpyxl>=3.0.9",
"requests>=2.26.0",
"scipy>=1.7.2",
]
dynamic = [
"version",
]
requires-python = ">=3.10"

[project.readme]
file = "README.md"
Expand All @@ -40,14 +40,15 @@ repository = "https://github.com/spacetelescope/pysiaf"

[project.optional-dependencies]
test = [
'pytest',
"pytest",
]
docs = [
"stsci-rtd-theme",
"sphinx-rtd-theme>=1.3.0",
"sphinx-automodapi",
"sphinx>=7.2.5",
"numpy",
"numpydoc>=1.1.0",
"matplotlib",
"scipy",
"tomli; python_version<\"3.11\"",
Expand Down
2 changes: 1 addition & 1 deletion pysiaf/aperture.py
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,7 @@ def sky_to_tel(self, *args):
Input sky coords should be given in degrees RA and Dec, or equivalent astropy.Quantities
Results are returned as floats with implicit units of arcseconds, for consistency with the
other \*_to_tel functions.
other \\*_to_tel functions.
"""

Expand Down
Binary file added pysiaf/pre_delivery_data/FGS/FGS_SIAF.xlsx
Binary file not shown.
Loading

0 comments on commit b386490

Please sign in to comment.