diff --git a/.env b/.env deleted file mode 100644 index 4f03e6b2..00000000 --- a/.env +++ /dev/null @@ -1,2 +0,0 @@ -# This helps gh-actions setup a cached venv -AGENT_TOOLSDIRECTORY=/root/venv diff --git a/.github/workflows/model.yml b/.github/workflows/model.yml index fdc56654..902848da 100644 --- a/.github/workflows/model.yml +++ b/.github/workflows/model.yml @@ -10,7 +10,9 @@ jobs: container: image: docker://ghcr.io/iterative/cml:0-dvc2-base1-gpu volumes: - - /home/runner/work/_temp/_github_home:/root + - /home/runner/work/frdc-ml/_github_home:/root + env: + AGENT_TOOLSDIRECTORY: "/root/venv" steps: - uses: actions/checkout@v3 @@ -18,11 +20,11 @@ jobs: - name: Force change owner run: | chown -R root: ~ + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: python-version: "3.11" - cache: 'pip' - name: Install via exported requirements.txt run: | @@ -30,7 +32,7 @@ jobs: python -m pip install flake8 pytest poetry poetry export --with dev --without-hashes -o requirements.txt pip3 install -r requirements.txt - pip3 install torch torchvision torchaudio + pip3 install torch torchvision torchaudio - name: Set up gcloud id: 'auth' @@ -51,7 +53,7 @@ jobs: - name: Run Model Training run: | - python3 -m tests.model_tests.chestnut_dec_may.main + python3 -m tests.model_tests.chestnut_dec_may.main - name: Comment results via CML run: | diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index ac8f5c54..d29a0611 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -1,14 +1,9 @@ -# This workflow will install Python dependencies, run tests and lint with a variety of Python versions -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python - name: Python CI on: - workflow_dispatch: - -# push: -# branches: [ "main" ] -# pull_request: + push: + branches: [ "main" ] + pull_request: jobs: build: @@ -36,7 +31,7 @@ jobs: - name: 'Set up Cloud SDK' uses: 'google-github-actions/setup-gcloud@v1' -# We don't necessarily need to install the CUDA version of torch, so we'll do with cpu + # We don't necessarily need to install the CUDA version of torch, so we'll do with cpu - name: Install dependencies run: | python -m pip install --upgrade pip @@ -54,5 +49,3 @@ jobs: - name: Test with pytest run: | pytest - -