Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/ci_devtests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ on:
push:
branches:
- main
- develop
tags:
- '*'
pull_request:
branches:
- main
- develop
schedule:
# run every Monday at 5am UTC
- cron: '0 5 * * 1'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ on:
push:
branches:
- main
- develop
tags:
- '*'
pull_request:
branches:
- main
- develop
schedule:
# run every Monday at 5am UTC
- cron: '0 5 * * 1'
Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/sync_fork.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Sync Fork
run-name: Sync Fork
on:
schedule:
- cron: '58 23 * * *' # run every day - two minutes to midnight
workflow_dispatch: # to enable manual runs of the workflow

jobs:
Get-Timestamp:
runs-on: ubuntu-latest
steps:
- run: date

Sync-With-Upstream:
runs-on: ubuntu-latest
steps:
- run: echo "The job was automatically triggered by a ${{ github.event_name }} event."
- run: echo "This job is now running on a ${{ runner.os }} server hosted by GitHub"
- run: echo "Running on branch ${{ github.ref }}, repository ${{ github.repository }}."
- name: Check out repository code
uses: actions/checkout@v4
with:
fetch-depth: 0
- run: echo "The ${{ github.repository }} repository has been cloned to the runner."
- name: List files in the repository
run: |
ls ${{ github.workspace }}
- name: Sync repository with upstream
run: |
cd ${{ github.workspace }}
git config --global user.email "jcarmona@eso.org"
git config --global user.name "Nightly Sync"
git remote add upstream https://github.com/astropy/astroquery.git
git remote -v
git fetch upstream main
echo "--- upstream log: "
git log upstream/main --oneline -10
echo "--- current branch log before merge: "
git log --oneline -10
git merge upstream/main
echo "--- current branch log after merge: "
git log --oneline -10
echo "--- push force with lease"
git push --force-with-lease
- run: echo "The job finished with status ${{ job.status }}."
1 change: 1 addition & 0 deletions astroquery/eso/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@


__all__ = ['Eso', 'EsoClass']
# DUMMY CHANGE


class CalSelectorError(Exception):
Expand Down
4 changes: 3 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ show-response = 1
[tool:pytest]
minversion = 7.4
norecursedirs = build docs/_build astroquery/irsa astroquery/nasa_exoplanet_archive astroquery/ned astroquery/ibe astroquery/irsa_dust astroquery/cds astroquery/sha astroquery/dace
testpaths = astroquery docs
testpaths =
docs/eso
astroquery/eso
doctest_plus = enabled
astropy_header = true
text_file_format = rst
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ commands =
devdeps: pip install -U --pre --no-deps --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy

python -m pip freeze
!cov: pytest --pyargs astroquery {toxinidir}/docs {env:PYTEST_ARGS} {posargs}
cov: pytest --pyargs astroquery {toxinidir}/docs --cov astroquery --cov-config={toxinidir}/setup.cfg {env:PYTEST_ARGS} {posargs}
!cov: pytest --pyargs astroquery.eso {toxinidir}/docs/eso {env:PYTEST_ARGS} {posargs}
cov: pytest --pyargs astroquery.eso {toxinidir}/docs/eso --cov astroquery.eso --cov-config={toxinidir}/setup.cfg {env:PYTEST_ARGS} {posargs}
# For remote tests, we re-run the failures to filter out at least some of the flaky ones.
# We use a second pytest run with --last-failed as opposed to --rerun in order to rerun the
# failed ones at the end rather than right away.
online: pytest --pyargs astroquery {toxinidir}/docs {env:PYTEST_ARGS_2} {posargs}
online: pytest --pyargs astroquery.eso {toxinidir}/docs/eso {env:PYTEST_ARGS_2} {posargs}
cov: coverage xml -o {toxinidir}/coverage.xml

pip_pre =
Expand Down
Loading