Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update FGS J-FRAME aperture following Oct 2024 FGS1-to-JFrame k-constants update #354

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ef38195
require Python 3.10
zacharyburnett Mar 14, 2024
9b02633
Update pyproject.toml
zacharyburnett Mar 14, 2024
29b9f62
update references to Python 3.9
zacharyburnett Mar 15, 2024
9e90855
update actions version
zacharyburnett Feb 8, 2024
a767382
extend plot_main_apertures to also plot HST or Roman apertures
mperrin May 20, 2024
7526e7b
Move numpydoc to [docs] installation target
jhunkeler Aug 29, 2024
56fe105
Merge pull request #349 from mfixstsci/release-0.23.0
mfixstsci Sep 13, 2024
294e856
Merge branch 'main' into update/actions
mfixstsci Sep 13, 2024
57eccb4
Merge pull request #332 from zacharyburnett/update/actions
mfixstsci Sep 13, 2024
8460c6c
Merge branch 'main' into scsb145
mfixstsci Sep 13, 2024
e38ce6c
Merge branch 'main' into optional-dependencies-docs-numpydoc
mfixstsci Sep 13, 2024
d846c13
Merge pull request #347 from jhunkeler/optional-dependencies-docs-num…
mfixstsci Sep 13, 2024
4e8d5fc
Removing 3.12 support
mfixstsci Sep 13, 2024
545adb2
Merge pull request #337 from zacharyburnett/scsb145
mfixstsci Sep 13, 2024
de0dee1
Remove publish to pypi add build ci
mfixstsci Sep 13, 2024
77272ff
Merge pull request #350 from mfixstsci/remove-publish-to-pypi
mfixstsci Sep 13, 2024
f774d74
trivial syntax fix to avoid SyntaxWarning
mperrin Sep 16, 2024
f0173b4
Merge branch 'main' into escape_sequence_fix
Witchblade101 Sep 17, 2024
c835ef2
Merge pull request #351 from mperrin/escape_sequence_fix
mfixstsci Sep 17, 2024
4fa46b3
Adding python 3.12 to build matrix
mfixstsci Sep 17, 2024
0edaef5
Add pip install setuptools
mfixstsci Sep 17, 2024
4d55254
Merge pull request #352 from mfixstsci/add-python-3.12-build
mfixstsci Sep 18, 2024
bce46e3
Merge pull request #342 from mperrin/plot_main_apertures_multimission
Witchblade101 Sep 20, 2024
39813ee
Merge remote-tracking branch 'upstream/siaf-updates'
Oct 18, 2024
2370a21
Changed FGS SIAF parameters for J-FRAME aperture
Oct 21, 2024
2539dd5
Added changes to the fgs_siaf_alignment.txt
Oct 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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