diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 9c8d6090..a2958218 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -44,7 +44,7 @@ jobs: run: | pytest --cov=goodman_pipeline - - uses: codecov/codecov-action@v3 + - uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos fail_ci_if_error: true # optional (default = false) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index ad9e1206..7d110235 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -7,24 +7,40 @@ on: types: [created] jobs: - deploy: - + release-build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: '3.x' - name: Install dependencies run: | - python -m pip install --upgrade pip - pip install setuptools wheel twine - - name: Build and publish - env: - TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} - TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: | - python setup.py sdist bdist_wheel - twine upload dist/* + python3 -m pip install build + - name: Build a binary wheel and source tarball + run: python3 -m build + - name: Upload artifacts + uses: actions/upload-artifacts@v4 + with: + name: release-dists + path: dist/ + + pypi-publish: + name: Publish Package to PyPI + runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/tags/') + needs: + - release-build + permission: + id-token: write + + steps: + - name: Retrieve release distributions + uses: actions/download-artifact@v4 + with: + name: release-dists + path: dist/ + - name: Publish release distributions to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/goodman_pipeline/data/ref_comp/goodman_comp_1200_CaNIR_OG570_NeArHg.fits b/goodman_pipeline/data/ref_comp/goodman_comp_1200_CaNIR_OG570_HgArNe.fits similarity index 100% rename from goodman_pipeline/data/ref_comp/goodman_comp_1200_CaNIR_OG570_NeArHg.fits rename to goodman_pipeline/data/ref_comp/goodman_comp_1200_CaNIR_OG570_HgArNe.fits diff --git a/goodman_pipeline/version.py b/goodman_pipeline/version.py index c3bb1098..11d9e9c2 100644 --- a/goodman_pipeline/version.py +++ b/goodman_pipeline/version.py @@ -1,2 +1,2 @@ # This is an automatic generated file please do not edit -__version__ = '1.3.7' \ No newline at end of file +__version__ = '1.3.8' \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index ddfd28de..6ab14c5e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,8 +16,8 @@ show_response = 1 package_name = goodman_pipeline description = Pipeline for reducing Goodman HTS data. long_description = Provides everything need to reduce Goodman High Throughput Spectrograph data. -author = Simon Torres -author_email = storres@ctio.noao.edu +author = Simón Torres +author_email = simon.torres@noirlab.edu license = BSD-3-Clause # url = edit_on_github = False @@ -32,4 +32,4 @@ install_requires = ccdproc astroplan # version should be PEP440 compatible (http://www.python.org/dev/peps/pep-0440) -version = 1.3.7 +version = 1.3.8 diff --git a/setup.py b/setup.py index caa5c8ed..cebc2e23 100644 --- a/setup.py +++ b/setup.py @@ -93,8 +93,8 @@ def create_version_py(packagename, version, source_dir='.'): u'Cesar Briceño, ' u'David Sanmartin, ', - author_email='storres@ctio.noao.edu, bquint@ctio.noao.edu, ' - 'cbriceno@ctio.noao.edu', + author_email='simon.torres@noirlab.edu, bruno.quint@noirlab.edu, ' + 'cesar.briceno@noirlab.edu', # Choose your license license=LICENSE, @@ -156,5 +156,3 @@ def create_version_py(packagename, version, source_dir='.'): 'goodman_pipeline/scripts/redspec', ], ) - -