From b9ed9db5d5a4eb7f76b7e5f1c43b5b125a27b110 Mon Sep 17 00:00:00 2001 From: Ben Botsford Date: Wed, 15 Mar 2023 15:06:33 -0500 Subject: [PATCH 1/2] update env.py, models.py --- lib/freebies.db | Bin 20480 -> 20480 bytes lib/migrations/env.py | 2 +- ... => 5f72c58bf48c_create_companies_devs.py} | 12 ++++++------ ...eebies_db.py => 7a71dbf71c64_create_db.py} | 8 ++++---- lib/models.py | 12 ++++++++---- 5 files changed, 19 insertions(+), 15 deletions(-) rename lib/migrations/versions/{ee905476242e_add_companies_devs_tables.py => 5f72c58bf48c_create_companies_devs.py} (82%) rename lib/migrations/versions/{c4d7867d81f5_create_freebies_db.py => 7a71dbf71c64_create_db.py} (67%) diff --git a/lib/freebies.db b/lib/freebies.db index 271836bca14f8d717e3d32909043488fb274d1cb..12beb1c963e832db481e7a7493e3029e691ac4dc 100644 GIT binary patch delta 48 tcmZozz}T>WaY7PPyzIu53GzIqY34@BrWQ$QCKkz?6u$7I2rM#C004rv4=exx delta 48 tcmZozz}T>WaY7PPxW~qn3GzItsg?$&Cgx^FCPt~76u$7I2rM#C004Z|4ut>! diff --git a/lib/migrations/env.py b/lib/migrations/env.py index f0c8fe63d..c7aab9656 100644 --- a/lib/migrations/env.py +++ b/lib/migrations/env.py @@ -66,7 +66,7 @@ def run_migrations_online() -> None: with connectable.connect() as connection: context.configure( - connection=connection, target_metadata=target_metadata + connection=connection, target_metadata=target_metadata, render_as_batch=True, ) with context.begin_transaction(): diff --git a/lib/migrations/versions/ee905476242e_add_companies_devs_tables.py b/lib/migrations/versions/5f72c58bf48c_create_companies_devs.py similarity index 82% rename from lib/migrations/versions/ee905476242e_add_companies_devs_tables.py rename to lib/migrations/versions/5f72c58bf48c_create_companies_devs.py index 3adc1353f..c191bb2f9 100644 --- a/lib/migrations/versions/ee905476242e_add_companies_devs_tables.py +++ b/lib/migrations/versions/5f72c58bf48c_create_companies_devs.py @@ -1,8 +1,8 @@ -"""add companies, devs tables +"""create companies, devs -Revision ID: ee905476242e -Revises: c4d7867d81f5 -Create Date: 2022-11-02 14:15:14.386683 +Revision ID: 5f72c58bf48c +Revises: 7a71dbf71c64 +Create Date: 2023-03-15 15:06:20.944586 """ from alembic import op @@ -10,8 +10,8 @@ # revision identifiers, used by Alembic. -revision = 'ee905476242e' -down_revision = 'c4d7867d81f5' +revision = '5f72c58bf48c' +down_revision = '7a71dbf71c64' branch_labels = None depends_on = None diff --git a/lib/migrations/versions/c4d7867d81f5_create_freebies_db.py b/lib/migrations/versions/7a71dbf71c64_create_db.py similarity index 67% rename from lib/migrations/versions/c4d7867d81f5_create_freebies_db.py rename to lib/migrations/versions/7a71dbf71c64_create_db.py index da258dc89..23e0a655b 100644 --- a/lib/migrations/versions/c4d7867d81f5_create_freebies_db.py +++ b/lib/migrations/versions/7a71dbf71c64_create_db.py @@ -1,8 +1,8 @@ -"""create freebies.db +"""create db -Revision ID: c4d7867d81f5 +Revision ID: 7a71dbf71c64 Revises: -Create Date: 2022-11-02 14:14:44.979104 +Create Date: 2023-03-15 15:05:55.516631 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = 'c4d7867d81f5' +revision = '7a71dbf71c64' down_revision = None branch_labels = None depends_on = None diff --git a/lib/models.py b/lib/models.py index 8bc917b0c..2681bee5a 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,9 +1,13 @@ -#!/usr/bin/env python3 - -from sqlalchemy import (Column, String, Integer) +from sqlalchemy import ForeignKey, Column, Integer, String, MetaData +from sqlalchemy.orm import relationship, backref from sqlalchemy.ext.declarative import declarative_base -Base = declarative_base() +convention = { + "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", +} +metadata = MetaData(naming_convention=convention) + +Base = declarative_base(metadata=metadata) class Company(Base): __tablename__ = 'companies' From 0a2a67638c9373d251d438f35d166602da48f6fd Mon Sep 17 00:00:00 2001 From: Liz Burton Date: Fri, 17 Nov 2023 15:59:33 -0500 Subject: [PATCH 2/2] AUTO: replace github workflow --- ...vas-sync-codegrade.yml => canvas-sync-ruby-update.yml} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename .github/workflows/{canvas-sync-codegrade.yml => canvas-sync-ruby-update.yml} (80%) diff --git a/.github/workflows/canvas-sync-codegrade.yml b/.github/workflows/canvas-sync-ruby-update.yml similarity index 80% rename from .github/workflows/canvas-sync-codegrade.yml rename to .github/workflows/canvas-sync-ruby-update.yml index baacfa810..f8818dc0c 100644 --- a/.github/workflows/canvas-sync-codegrade.yml +++ b/.github/workflows/canvas-sync-ruby-update.yml @@ -1,10 +1,10 @@ -name: Sync with Canvas CodeGrade +name: Sync with Canvas Ruby v2.7 on: push: branches: [master, main] paths: - - "README.md" + - 'README.md' jobs: sync: @@ -18,14 +18,14 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 2.7 - name: Install github-to-canvas run: gem install github-to-canvas # Secret stored in learn-co-curriculum Settings/Secrets - name: Sync from .canvas file - run: github-to-canvas -a -lr --contains-html + run: github-to-canvas -a -lr env: CANVAS_API_KEY: ${{ secrets.CANVAS_API_KEY }} CANVAS_API_PATH: ${{ secrets.CANVAS_API_PATH }}