From: Markus Mattes Date: Mon, 21 Nov 2016 17:05:23 +0000 (-0500) Subject: file generated by alembic revison is now pep8 compliant X-Git-Tag: rel_0_8_9~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e197537229a0f25e764f9f7dbd469635906004fb;p=thirdparty%2Fsqlalchemy%2Falembic.git file generated by alembic revison is now pep8 compliant Change-Id: I233d2ba2cbbe6a363d9118182f1d855a6a12b00c Pull-request: https://github.com/zzzeek/alembic/pull/31 --- diff --git a/alembic/templates/generic/script.py.mako b/alembic/templates/generic/script.py.mako index 8f45a34e..2c015630 100644 --- a/alembic/templates/generic/script.py.mako +++ b/alembic/templates/generic/script.py.mako @@ -15,6 +15,7 @@ down_revision = ${repr(down_revision)} branch_labels = ${repr(branch_labels)} depends_on = ${repr(depends_on)} + def upgrade(): ${upgrades if upgrades else "pass"} diff --git a/alembic/testing/env.py b/alembic/testing/env.py index 91c7fa53..5ad6c694 100644 --- a/alembic/testing/env.py +++ b/alembic/testing/env.py @@ -257,9 +257,11 @@ down_revision = None from alembic import op + def upgrade(): op.execute("CREATE STEP 1") + def downgrade(): op.execute("DROP STEP 1") @@ -273,9 +275,11 @@ down_revision = '%s' from alembic import op + def upgrade(): op.execute("CREATE STEP 2") + def downgrade(): op.execute("DROP STEP 2") @@ -289,9 +293,11 @@ down_revision = '%s' from alembic import op + def upgrade(): op.execute("CREATE STEP 3") + def downgrade(): op.execute("DROP STEP 3") diff --git a/docs/build/changelog.rst b/docs/build/changelog.rst index f10a61ea..b78eaa7b 100644 --- a/docs/build/changelog.rst +++ b/docs/build/changelog.rst @@ -6,6 +6,14 @@ Changelog .. changelog:: :version: 0.8.9 + .. change:: + :tags: bug, autogenerate + :tickets: 393 + + Continued pep8 improvements by adding appropriate whitespace in + the base template for generated migrations. Pull request courtesy + Markus Mattes. + .. change:: :tags: bug, revisioning diff --git a/tests/test_postgresql.py b/tests/test_postgresql.py index d39df72b..21479a06 100644 --- a/tests/test_postgresql.py +++ b/tests/test_postgresql.py @@ -90,11 +90,13 @@ from alembic import op from sqlalchemy.dialects.postgresql import ENUM from sqlalchemy import Column + def upgrade(): op.create_table("sometable", Column("data", ENUM("one", "two", "three", name="pgenum")) ) + def downgrade(): op.drop_table("sometable") """ % self.rid) @@ -108,6 +110,7 @@ from alembic import op from sqlalchemy.dialects.postgresql import ENUM from sqlalchemy import Column + def upgrade(): enum = ENUM("one", "two", "three", name="pgenum", create_type=False) enum.create(op.get_bind(), checkfirst=False) @@ -115,6 +118,7 @@ def upgrade(): Column("data", enum) ) + def downgrade(): op.drop_table("sometable") ENUM(name="pgenum").drop(op.get_bind(), checkfirst=False) diff --git a/tests/test_script_consumption.py b/tests/test_script_consumption.py index c2eef0a2..fc9d9aa0 100644 --- a/tests/test_script_consumption.py +++ b/tests/test_script_consumption.py @@ -47,9 +47,11 @@ class ApplyVersionsFunctionalTest(TestBase): from alembic import op + def upgrade(): op.execute("CREATE TABLE foo(id integer)") + def downgrade(): op.execute("DROP TABLE foo") @@ -62,9 +64,11 @@ class ApplyVersionsFunctionalTest(TestBase): from alembic import op + def upgrade(): op.execute("CREATE TABLE bar(id integer)") + def downgrade(): op.execute("DROP TABLE bar") @@ -77,9 +81,11 @@ class ApplyVersionsFunctionalTest(TestBase): from alembic import op + def upgrade(): op.execute("CREATE TABLE bat(id integer)") + def downgrade(): op.execute("DROP TABLE bat") @@ -221,9 +227,11 @@ class VersionNameTemplateTest(TestBase): from alembic import op + def upgrade(): op.execute("CREATE TABLE foo(id integer)") + def downgrade(): op.execute("DROP TABLE foo") @@ -244,9 +252,11 @@ class VersionNameTemplateTest(TestBase): from alembic import op + def upgrade(): op.execute("CREATE TABLE foo(id integer)") + def downgrade(): op.execute("DROP TABLE foo") @@ -270,11 +280,14 @@ down_revision = None from alembic import op + def upgrade(): op.execute("CREATE TABLE foo(id integer)") + def downgrade(): op.execute("DROP TABLE foo") + """) pyc_path = util.pyc_file_from_path(path) if os.access(pyc_path, os.F_OK): @@ -350,9 +363,11 @@ class SourcelessNeedsFlagTest(TestBase): from alembic import op + def upgrade(): op.execute("CREATE TABLE foo(id integer)") + def downgrade(): op.execute("DROP TABLE foo") diff --git a/tests/test_script_production.py b/tests/test_script_production.py index d32a94c7..7cabc773 100644 --- a/tests/test_script_production.py +++ b/tests/test_script_production.py @@ -201,7 +201,7 @@ class RevisionCommandTest(TestBase): file_.write( "<%text># ${message}\n" "revision = ${repr(up_revision)}\n" - "down_revision = ${repr(down_revision)}\n" + "down_revision = ${repr(down_revision)}\n\n" "def upgrade():\n" " ${upgrades if upgrades else 'pass'}\n\n" "def downgrade():\n" @@ -252,9 +252,11 @@ branch_labels = ['%s'] from alembic import op + def upgrade(): pass + def downgrade(): pass @@ -870,9 +872,11 @@ branch_labels = ['%s'] from alembic import op + def upgrade(): pass + def downgrade(): pass