Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
78b3e8d
Setup auto sync fork for main branch
juanmcloaiza Sep 12, 2025
f03b75f
Setup custom CI/CD for ESO submodule
juanmcloaiza Sep 11, 2025
591b493
update eso for initial catalogue testing
ashleythomasbarnes Jan 14, 2026
c03ff9b
update catalogue tests
ashleythomasbarnes Jan 15, 2026
3180cdb
remove async from query_catalogues
ashleythomasbarnes Jan 15, 2026
47f6663
list_catalogues and query_catalogue working
ashleythomasbarnes Jan 16, 2026
8fe8c04
include RA/Dec query catalogue, print_help output table
ashleythomasbarnes Jan 16, 2026
a7c80e8
removed testing
ashleythomasbarnes Jan 16, 2026
9e883d3
updated tests -- didn't check!
ashleythomasbarnes Jan 16, 2026
5745b59
removed RA/Dec query functionality
ashleythomasbarnes Jan 23, 2026
b282ba0
remove RA/Dec column resolution method from EsoClass
ashleythomasbarnes Jan 23, 2026
f992b5e
moved query_on_allowed_values
ashleythomasbarnes Jan 23, 2026
a98016d
update documentation for cone search
ashleythomasbarnes Jan 23, 2026
06ec691
Setup auto sync fork for main branch
juanmcloaiza Sep 12, 2025
1a6e927
Setup custom CI/CD for ESO submodule
juanmcloaiza Sep 11, 2025
2e54761
Merge branch 'develop' into develop-catalogues
juanmcloaiza Jan 23, 2026
08c1a4c
updated a number of PR comments
ashleythomasbarnes Jan 28, 2026
fbaec01
remove deprecated_renamed_argument
ashleythomasbarnes Jan 28, 2026
0eff8a8
remove deprecated_renamed_argument
ashleythomasbarnes Jan 28, 2026
3654699
updated a number of minor comments
ashleythomasbarnes Jan 28, 2026
0e2564d
remove deprecated_renamed_argument
ashleythomasbarnes Jan 28, 2026
e6d74ea
Setup auto sync fork for main branch
juanmcloaiza Sep 12, 2025
2345b66
Setup custom CI/CD for ESO submodule
juanmcloaiza Sep 11, 2025
c05acef
Merge branch 'eso:develop' into develop-catalogues
ashleythomasbarnes Jan 28, 2026
6c582f9
update tap_url function
ashleythomasbarnes Jan 28, 2026
d296b38
some putbacks
ashleythomasbarnes Jan 28, 2026
d60edc1
putback
ashleythomasbarnes Jan 28, 2026
1ca3935
minor refactor
ashleythomasbarnes Jan 28, 2026
0e2d368
updated tests
ashleythomasbarnes Jan 28, 2026
af686fc
updated test data
ashleythomasbarnes Jan 28, 2026
eb34c4d
typo change
ashleythomasbarnes Jan 28, 2026
d4e2867
update _try_download_pyvo_table error
ashleythomasbarnes Jan 29, 2026
ddf82fb
updated max_row_limit to 15000000
ashleythomasbarnes Jan 29, 2026
10a0d9e
updated tests
ashleythomasbarnes Jan 29, 2026
73e5b63
updated _tap_url and _which_tap to be more general
ashleythomasbarnes Feb 12, 2026
ecc8c31
MAX_ROW_LIMIT update
ashleythomasbarnes Feb 12, 2026
9098da1
code style update
ashleythomasbarnes Feb 12, 2026
ec7b6bf
code style tests update
ashleythomasbarnes Feb 12, 2026
92d33f6
coding style updates
ashleythomasbarnes Feb 12, 2026
16223d9
add CHANGES
ashleythomasbarnes Feb 13, 2026
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 CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ eso
- Cone search using ``cone_ra`, ``cone_dec`, ``cone_radius`` arguments. [#3339]
- Retrieve record count before querying the archive, via ``count_only`` argument. [#3339]
- Ask query functions to print the underlying ADQL queries without issuing them. [#3339]
- Add functionality to list and query ESO catalogues. [#XXXX]

gaia
^^^^
Expand Down
13 changes: 9 additions & 4 deletions astroquery/eso/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,21 @@ class Conf(_config.ConfigNamespace):
"""
Configuration parameters for `astroquery.eso`.
"""

MAX_ROW_LIMIT = _config.ConfigItem(
15000000,
'Maximum number of rows allowed by the TAP service.')
ROW_LIMIT = _config.ConfigItem(
1000,
'Maximum number of rows returned (set to -1 for unlimited).')
'Maximum number of rows returned (set to -1 for maximum allowed via TAP service).')
username = _config.ConfigItem(
"",
'Optional default username for ESO archive.')
tap_url = _config.ConfigItem(
tap_obs_url = _config.ConfigItem(
"https://archive.eso.org/tap_obs",
'URL for TAP queries.')
'URL for TAP observation queries.')
tap_cat_url = _config.ConfigItem(
"https://archive.eso.org/tap_cat",
'URL for TAP catalogue queries.')


conf = Conf()
Expand Down
Loading
Loading