Skip to content

Commit

Permalink
Final v4 changes hopefully
Browse files Browse the repository at this point in the history
  • Loading branch information
evamaxfield committed Feb 21, 2023
1 parent e9517b4 commit 55d51fd
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 61 deletions.
36 changes: 5 additions & 31 deletions .github/workflows/ci.yml
Expand Up @@ -37,7 +37,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.10"]
python-version: [3.8, 3.9, "3.10"]
os: [ubuntu-latest]

steps:
Expand Down Expand Up @@ -69,9 +69,9 @@ jobs:
run: |
python -m pip install --upgrade pip
just install
# - name: Run Lib Tests
# run: |
# just test-library
- name: Run Lib Tests
run: |
just test-library
- name: Run Func Tests
run: |
just test-functions
Expand Down Expand Up @@ -128,30 +128,4 @@ jobs:
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: CouncilDataProject
password: ${{ secrets.PYPI_TOKEN }}

# Build and release cdp-backend Docker image
- name: Sleep for PyPI Indexing Time
run: |
sleep 120
- name: Log in to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract Metadata (tags, labels) for Docker
id: docker-meta
uses: docker/metadata-action@v4
with:
images: ghcr.io/${{ github.repository }}

- name: Build and Push Docker Image to GitHub Container Registry
uses: docker/build-push-action@v4
with:
context: .
push: true
tags: ${{ steps.docker-meta.outputs.tags }}
labels: ${{ steps.docker-meta.outputs.labels }}
password: ${{ secrets.PYPI_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -139,6 +139,7 @@ dev-infrastructure/Justfile
dev-infrastructure/gcloud-functions/*
dev-infrastructure/lifecycle-rules.json
test-clipped.*
faster-whisper-models/

# Common credentials directories
.keys/
Expand Down
20 changes: 0 additions & 20 deletions Dockerfile

This file was deleted.

9 changes: 0 additions & 9 deletions Justfile
Expand Up @@ -85,15 +85,6 @@ serve-docs:
just generate-docs
python -mwebbrowser -t "file://{{project_uri}}/docs/_build/index.html"

# build the docker image for pipeline running
DOCKER_IMAGE_NAME := 'councildataproject/cdp-backend'
docker-build:
docker build --progress=plain -t {{ DOCKER_IMAGE_NAME }} .

# run the docker image locally
docker-run:
docker run --rm -it --gpus all {{ DOCKER_IMAGE_NAME }} bash

# tag a new version
tag-for-release version:
git tag -a "{{version}}" -m "{{version}}"
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Expand Up @@ -78,7 +78,7 @@ pipeline = [
"tqdm~=4.62",
"transformers~=4.16",
"vimeo_downloader~=0.4",
"yt-dlp>=2022.2.4",
"yt-dlp>=2023.2.17",
]
functions = [
"flask==2.1.0",
Expand Down

0 comments on commit 55d51fd

Please sign in to comment.