Skip to content

Commit

Permalink
Reorganize scripts into new package (#457)
Browse files Browse the repository at this point in the history
* reorganize scripts to new package

* add astrodb_scripts to tests and github actions

* add astrodb_scripts to devcontainer and environment
  • Loading branch information
kelle authored Jan 30, 2024
1 parent 4485915 commit 797ae10
Show file tree
Hide file tree
Showing 16 changed files with 922 additions and 1,983 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"forwardPorts": [5432],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "pip install astrodbkit2 pytest psycopg2 ads",
"postCreateCommand": "pip install astrodbkit2 pytest psycopg2 ads git+https://github.com/astrodbtoolkit/astrodb_scripts.git@main",
// python scripts/tutorials/generate_database.py sqlite
// python scripts/tutorials/generate_database.py postgres postgres://postgres@localhost:5432

Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/gen-db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,18 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python 3.10
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.10'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install astrodbkit2
pip install git+https://github.com/astrodbtoolkit/astrodb_scripts.git@main
- name: Generate sqlite (file) database
run: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python 3.10
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand All @@ -26,6 +26,7 @@ jobs:
python -m pip install --upgrade pip
pip install pytest ads
pip install astrodbkit2
pip install git+https://github.com/astrodbtoolkit/astrodb_scripts.git@main
- name: Test with pytest
run: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/scheduled-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python 3.10
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand All @@ -26,6 +26,7 @@ jobs:
python -m pip install --upgrade pip
pip install pytest ads
pip install astrodbkit2
pip install git+https://github.com/astrodbtoolkit/astrodb_scripts.git@main
- name: Test with pytest
run: |
Expand Down
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,4 @@ dependencies:
- webencodings==0.5.1
- werkzeug==2.2.2
- zipp==3.13.0
- git+https://github.com/astrodbtoolkit/astrodb_scripts.git@main
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 797ae10

Please sign in to comment.