Skip to content

Commit

Permalink
Merge pull request #64 from dagster-io/clean-up-build
Browse files Browse the repository at this point in the history
Clean up build
  • Loading branch information
cnolanminich authored Mar 19, 2024
2 parents b2c66d0 + fb8829d commit f5ae6f3
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 58 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/deploy-dagster-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,11 @@ jobs:
# Build 'data-eng-pipeline' code location
- name: Build dbt manifest for data-eng-pipeline
if: steps.prerun.outputs.result != 'skip'
run: make manifest
run: |
pip install pyopenssl --upgrade;
pip install click --upgrade;
pip install dbt-core dbt-duckdb dbt-snowflake;
make manifest
# Copy production manifest.json to S3 on merge
- name: Upload dbt manifest to S3
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
FROM python:3.8-slim
FROM python:3.11-slim

WORKDIR /opt/dagster/app

RUN apt-get update && apt-get install -y git
RUN apt-get update && apt-get install -y git gcc

RUN apt install -y default-jre

RUN python -m pip install -U pip
# libcrypto fix oct 2023; should be able to remove sometime after that
RUN python -m pip uninstall oscrypto -y
RUN python -m pip install git+https://github.com/wbond/oscrypto.git@d5f3437ed24257895ae1edd9e503cfb352e635a8

RUN python -m pip install -U uv

ADD . .

RUN pip install -e .
RUN uv pip install --system -e .
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ clean:
rm -rf ~/.dagster_home; mkdir ~/.dagster_home; cp dagster.yaml ~/.dagster_home/dagster.yaml

manifest:
pip install pyopenssl --upgrade;
pip install click --upgrade;
pip install dbt-core dbt-duckdb dbt-snowflake;
dbt parse --project-dir=dbt_project --profiles-dir=dbt_project/config --target BRANCH

stateful_dev: clean manifest
Expand All @@ -18,4 +15,4 @@ stateful_dev_prod: clean manifest
export DAGSTER_HOME="~/.dagster_home"; export DAGSTER_CLOUD_DEPLOYMENT_NAME="data-eng-prod"; dagster dev

dependencies:
pip install -e ".[dev]"
uv pip install -e ".[dev]"
48 changes: 0 additions & 48 deletions requirements.txt

This file was deleted.

3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
if __name__ == "__main__":
setup(
name="hooli_data_eng",
python_requires='<3.12',
packages=find_packages(exclude=["hooli_data_eng_tests"]),
package_data={"hooli_data_eng": ["dbt_project/*"]},
install_requires=[
Expand Down Expand Up @@ -33,4 +34,4 @@
"scikit-learn",
],
extras_require={"dev": ["dagit", "pytest"]},
)
)

0 comments on commit f5ae6f3

Please sign in to comment.