diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc3eb347..5d5370fa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,6 +35,7 @@ jobs: pip install .[all] pip install flake8 pytest pytest-cov mockmpi pytest-timeout if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + if [ -f dsps_reqs.txt ]; then pip install -r dsps_reqs.txt; fi - name: Test with pytest run: | python -m pytest -m "not slow" --cov=./rail --cov-report=xml diff --git a/dsps_reqs.txt b/dsps_reqs.txt new file mode 100644 index 00000000..4c424c8a --- /dev/null +++ b/dsps_reqs.txt @@ -0,0 +1,3 @@ +diffstar@git+https://github.com/ArgonneCPAC/diffstar@v0.1.0 +diffmah@git+https://github.com/ArgonneCPAC/diffmah@v0.4.1 +dsps@git+https://github.com/ArgonneCPAC/dsps@v0.2.0 diff --git a/pyproject.toml b/pyproject.toml index 137b8544..798faef3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,9 +37,6 @@ dependencies = [ "dustmaps", "pathos", "somoclu", - "diffstar@git+https://github.com/ArgonneCPAC/diffstar@v0.1.0", - "diffmah@git+https://github.com/ArgonneCPAC/diffmah@v0.4.1", - "dsps@git+https://github.com/ArgonneCPAC/dsps@v0.2.0", "deprecated", ] diff --git a/src/rail/core/__init__.py b/src/rail/core/__init__.py index 4e276727..6091842e 100644 --- a/src/rail/core/__init__.py +++ b/src/rail/core/__init__.py @@ -11,3 +11,7 @@ def find_version(): __version__ = find_version() except ImportError: # pragma: no cover __version__ = "unknown" + +from .stage import RailPipeline, RailStage +from .utilPhotometry import PhotormetryManipulator, HyperbolicSmoothing, HyperbolicMagnitudes +from .utilStages import ColumnMapper, RowSelector, LSSTFluxToMagConverter, TableConverter, Dereddener