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

updated squidward and mbappe #476

Merged
merged 18 commits into from
Aug 22, 2024
Merged
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: 0 additions & 2 deletions .github/workflows/apf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ jobs:
TEST_BALTO_MODEL_PATH: "${{ secrets.TEST_BALTO_MODEL_PATH }}"
TEST_BALTO_QUANTILES_PATH: "${{ secrets.TEST_BALTO_QUANTILES_PATH }}"
TEST_MESSI_MODEL_PATH: "${{ secrets.TEST_MESSI_MODEL_PATH }}"
TEST_MESSI_HEADER_QUANTILES_PATH: "${{ secrets.TEST_MESSI_HEADER_QUANTILES_PATH }}"
TEST_MESSI_FEATURE_QUANTILES_PATH: "${{ secrets.TEST_MESSI_FEATURE_QUANTILES_PATH }}"
TEST_TORETTO_MODEL_PATH: "${{ secrets.TEST_TORETTO_MODEL_PATH }}"
TEST_BARNEY_MODEL_PATH: "${{ secrets.TEST_BARNEY_MODEL_PATH }}"
Expand All @@ -169,7 +168,6 @@ jobs:
TEST_BALTO_MODEL_PATH: "${{ secrets.TEST_BALTO_MODEL_PATH }}"
TEST_BALTO_QUANTILES_PATH: "${{ secrets.TEST_BALTO_QUANTILES_PATH }}"
TEST_MESSI_MODEL_PATH: "${{ secrets.TEST_MESSI_MODEL_PATH }}"
TEST_MESSI_HEADER_QUANTILES_PATH: "${{ secrets.TEST_MESSI_HEADER_QUANTILES_PATH }}"
TEST_MESSI_FEATURE_QUANTILES_PATH: "${{ secrets.TEST_MESSI_FEATURE_QUANTILES_PATH }}"
TEST_TORETTO_MODEL_PATH: "${{ secrets.TEST_TORETTO_MODEL_PATH }}"
TEST_BARNEY_MODEL_PATH: "${{ secrets.TEST_BARNEY_MODEL_PATH }}"
Expand Down
26 changes: 12 additions & 14 deletions .github/workflows/lc_classification_step.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
TEST_BALTO_MODEL_PATH: "${{ secrets.TEST_BALTO_MODEL_PATH }}"
TEST_BALTO_QUANTILES_PATH: "${{ secrets.TEST_BALTO_QUANTILES_PATH }}"
TEST_MESSI_MODEL_PATH: "${{ secrets.TEST_MESSI_MODEL_PATH }}"
TEST_MESSI_HEADER_QUANTILES_PATH: "${{ secrets.TEST_MESSI_HEADER_QUANTILES_PATH }}"
TEST_MESSI_FEATURE_QUANTILES_PATH: "${{ secrets.TEST_MESSI_FEATURE_QUANTILES_PATH }}"
TEST_TORETTO_MODEL_PATH: "${{ secrets.TEST_TORETTO_MODEL_PATH }}"
TEST_MLP_MODEL_PATH: "${{ secrets.TEST_MLP_MODEL_PATH }}"
Expand All @@ -47,19 +46,18 @@ jobs:
test-folder: "tests/integration"
secrets:
GH_TOKEN: ${{ secrets.ADMIN_TOKEN }}
TEST_BALTO_MODEL_PATH: "${{ secrets.TEST_BALTO_MODEL_PATH }}"
TEST_BALTO_QUANTILES_PATH: "${{ secrets.TEST_BALTO_QUANTILES_PATH }}"
TEST_MESSI_MODEL_PATH: "${{ secrets.TEST_MESSI_MODEL_PATH }}"
TEST_MESSI_HEADER_QUANTILES_PATH: "${{ secrets.TEST_MESSI_HEADER_QUANTILES_PATH }}"
TEST_MESSI_FEATURE_QUANTILES_PATH: "${{ secrets.TEST_MESSI_FEATURE_QUANTILES_PATH }}"
TEST_TORETTO_MODEL_PATH: "${{ secrets.TEST_TORETTO_MODEL_PATH }}"
TEST_MLP_MODEL_PATH: "${{ secrets.TEST_MLP_MODEL_PATH }}"
TEST_ANOMALY_QUANTILES_PATH: "${{ secrets.TEST_ANOMALY_QUANTILES_PATH }}"
TEST_ANOMALY_MODEL_PATH: "${{ secrets.TEST_ANOMALY_MODEL_PATH }}"
TEST_MBAPPE_MODEL_PATH: "${{ secrets.TEST_MBAPPE_MODEL_PATH }}"
TEST_MBAPPE_FEATURES_QUANTILES_PATH: "${{ secrets.TEST_MBAPPE_FEATURES_QUANTILES_PATH }}"
TEST_MBAPPE_METADATA_QUANTILES_PATH: "${{ secrets.TEST_MBAPPE_METADATA_QUANTILES_PATH }}"
TEST_SQUIDWARD_MODEL_PATH: "${{ secrets.TEST_SQUIDWARD_MODEL_PATH }}"
TEST_BALTO_MODEL_PATH: ${{ secrets.TEST_BALTO_MODEL_PATH }}
TEST_BALTO_QUANTILES_PATH: ${{ secrets.TEST_BALTO_QUANTILES_PATH }}
TEST_MESSI_MODEL_PATH: ${{ secrets.TEST_MESSI_MODEL_PATH }}
TEST_MESSI_FEATURE_QUANTILES_PATH: ${{ secrets.TEST_MESSI_FEATURE_QUANTILES_PATH }}
TEST_TORETTO_MODEL_PATH: ${{ secrets.TEST_TORETTO_MODEL_PATH }}
TEST_MLP_MODEL_PATH: ${{ secrets.TEST_MLP_MODEL_PATH }}
TEST_ANOMALY_QUANTILES_PATH: ${{ secrets.TEST_ANOMALY_QUANTILES_PATH }}
TEST_ANOMALY_MODEL_PATH: ${{ secrets.TEST_ANOMALY_MODEL_PATH }}
TEST_MBAPPE_MODEL_PATH: ${{ secrets.TEST_MBAPPE_MODEL_PATH }}
TEST_MBAPPE_FEATURES_QUANTILES_PATH: ${{ secrets.TEST_MBAPPE_FEATURES_QUANTILES_PATH }}
TEST_MBAPPE_METADATA_QUANTILES_PATH: ${{ secrets.TEST_MBAPPE_METADATA_QUANTILES_PATH }}
TEST_SQUIDWARD_MODEL_PATH: ${{ secrets.TEST_SQUIDWARD_MODEL_PATH }}

build-lc-classification-balto-dagger:
uses: ./.github/workflows/template_build_with_dagger.yaml
Expand Down
20 changes: 4 additions & 16 deletions .github/workflows/poetry-tests-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,12 @@ on:
TEST_MESSI_MODEL_PATH:
required: false
description: 'A path to a .pt file'
TEST_MESSI_HEADER_QUANTILES_PATH:
required: false
description: 'A path to the directory containing joblib files for messi'
TEST_MESSI_FEATURE_QUANTILES_PATH:
required: false
description: 'A path to the directory containing joblib files for messi'
TEST_TORETTO_MODEL_PATH:
required: false
description: 'A path to a .pkl file'
TEST_BARNEY_MODEL_PATH:
required: false
description: 'A path to a .pkl file'
TEST_NEW_BARNEY_MODEL_PATH:
required: false
description: 'A path to a .pkl file'
TEST_MLP_MODEL_PATH:
required: false
description: 'A path to a .pkl file'
Expand Down Expand Up @@ -87,18 +78,15 @@ jobs:
TEST_BALTO_MODEL_PATH: ${{ secrets.TEST_BALTO_MODEL_PATH }}
TEST_BALTO_QUANTILES_PATH: ${{ secrets.TEST_BALTO_QUANTILES_PATH }}
TEST_MESSI_MODEL_PATH: ${{ secrets.TEST_MESSI_MODEL_PATH }}
TEST_MESSI_HEADER_QUANTILES_PATH: ${{ secrets.TEST_MESSI_HEADER_QUANTILES_PATH }}
TEST_MESSI_FEATURE_QUANTILES_PATH: ${{ secrets.TEST_MESSI_FEATURE_QUANTILES_PATH }}
TEST_TORETTO_MODEL_PATH: ${{ secrets.TEST_TORETTO_MODEL_PATH }}
TEST_BARNEY_MODEL_PATH: ${{ secrets.TEST_BARNEY_MODEL_PATH }}
TEST_NEW_BARNEY_MODEL_PATH: ${{ secrets.TEST_NEW_BARNEY_MODEL_PATH }}
TEST_MLP_MODEL_PATH: ${{ secrets.TEST_MLP_MODEL_PATH }}
TEST_ANOMALY_QUANTILES_PATH: ${{ secrets.TEST_ANOMALY_QUANTILES_PATH }}
TEST_ANOMALY_MODEL_PATH: ${{ secrets.TEST_ANOMALY_MODEL_PATH }}
TEST_MBAPPE_MODEL_PATH: "${{ secrets.TEST_MBAPPE_MODEL_PATH }}"
TEST_MBAPPE_FEATURES_QUANTILES_PATH: "${{ secrets.TEST_MBAPPE_FEATURES_QUANTILES_PATH }}"
TEST_MBAPPE_METADATA_QUANTILES_PATH: "${{ secrets.TEST_MBAPPE_METADATA_QUANTILES_PATH }}"
TEST_SQUIDWARD_MODEL_PATH: "${{ secrets.TEST_SQUIDWARD_MODEL_PATH }}"
TEST_MBAPPE_MODEL_PATH: ${{ secrets.TEST_MBAPPE_MODEL_PATH }}
TEST_MBAPPE_FEATURES_QUANTILES_PATH: ${{ secrets.TEST_MBAPPE_FEATURES_QUANTILES_PATH }}
TEST_MBAPPE_METADATA_QUANTILES_PATH: ${{ secrets.TEST_MBAPPE_METADATA_QUANTILES_PATH }}
TEST_SQUIDWARD_MODEL_PATH: ${{ secrets.TEST_SQUIDWARD_MODEL_PATH }}
steps:
- name: Check out repository code
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stamp_classifier_step.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
secrets:
GH_TOKEN: ${{ secrets.ADMIN_TOKEN }}

stamp_classifiier_step_integration:
stamp_classifier_step_integration:
uses: ./.github/workflows/pip-tests-template.yaml
with:
base-folder: 'stamp_classifier_step'
Expand Down
6 changes: 6 additions & 0 deletions correction_step/tests/integration/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
from tests.utils import atlas_extra_fields, lsst_extra_fields, ztf_extra_fields


@pytest.fixture(scope="session")
def docker_compose_command():
version = os.getenv("COMPOSE", "v2")
return "docker compose" if version == "v2" else "docker-compose"


@pytest.fixture(scope="session")
def docker_compose_file(pytestconfig):
return (pathlib.Path(pytestconfig.rootdir) / "tests/integration/docker-compose.yaml").absolute()
Expand Down
2 changes: 1 addition & 1 deletion early_classification_step/model/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ephem==3.7.7.0
absl-py==0.7.1
astor==0.8.0
astropy==3.2.1
astropy~=4.0
bleach==3.1.0
certifi==2019.6.16
chardet==3.0.4
Expand Down
Loading
Loading