commit 2677dbe80c6074d31c2c2d273f7e0868ed99250b
parent 4f83b207198765d2fad39455a7fdca0d87205c34
Author: lash <dev@holbrook.no>
Date: Sun, 10 Apr 2022 19:12:30 +0000
Update deps
Diffstat:
10 files changed, 8 insertions(+), 280 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
-- 0.0.1 (pending)
+- 0.1.0
+ * consume non chain-specific code
+- 0.0.1
* chainqueue and chainsyncer migration
* environment base
diff --git a/chaind/old/db/migrations/default/README b/chaind/old/db/migrations/default/README
@@ -1 +0,0 @@
-Generic single-database configuration.
-\ No newline at end of file
diff --git a/chaind/old/db/migrations/default/alembic.ini b/chaind/old/db/migrations/default/alembic.ini
@@ -1,85 +0,0 @@
-# A generic, single database configuration.
-
-[alembic]
-# path to migration scripts
-script_location = .
-
-# template used to generate migration files
-# file_template = %%(rev)s_%%(slug)s
-
-# timezone to use when rendering the date
-# within the migration file as well as the filename.
-# string value is passed to dateutil.tz.gettz()
-# leave blank for localtime
-# timezone =
-
-# max length of characters to apply to the
-# "slug" field
-# truncate_slug_length = 40
-
-# set to 'true' to run the environment during
-# the 'revision' command, regardless of autogenerate
-# revision_environment = false
-
-# set to 'true' to allow .pyc and .pyo files without
-# a source .py file to be detected as revisions in the
-# versions/ directory
-# sourceless = false
-
-# version location specification; this defaults
-# to ./versions. When using multiple version
-# directories, initial revisions must be specified with --version-path
-# version_locations = %(here)s/bar %(here)s/bat ./versions
-
-# the output encoding used when revision files
-# are written from script.py.mako
-# output_encoding = utf-8
-
-sqlalchemy.url = postgresql+psycopg2://postgres@localhost:5432/chaind
-
-
-[post_write_hooks]
-# post_write_hooks defines scripts or Python functions that are run
-# on newly generated revision scripts. See the documentation for further
-# detail and examples
-
-# format using "black" - use the console_scripts runner, against the "black" entrypoint
-# hooks=black
-# black.type=console_scripts
-# black.entrypoint=black
-# black.options=-l 79
-
-# Logging configuration
-[loggers]
-keys = root,sqlalchemy,alembic
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = WARN
-handlers = console
-qualname =
-
-[logger_sqlalchemy]
-level = WARN
-handlers =
-qualname = sqlalchemy.engine
-
-[logger_alembic]
-level = INFO
-handlers =
-qualname = alembic
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
diff --git a/chaind/old/db/migrations/default/env.py b/chaind/old/db/migrations/default/env.py
@@ -1,77 +0,0 @@
-from logging.config import fileConfig
-
-from sqlalchemy import engine_from_config
-from sqlalchemy import pool
-
-from alembic import context
-
-# this is the Alembic Config object, which provides
-# access to the values within the .ini file in use.
-config = context.config
-
-# Interpret the config file for Python logging.
-# This line sets up loggers basically.
-fileConfig(config.config_file_name)
-
-# add your model's MetaData object here
-# for 'autogenerate' support
-# from myapp import mymodel
-# target_metadata = mymodel.Base.metadata
-target_metadata = None
-
-# other values from the config, defined by the needs of env.py,
-# can be acquired:
-# my_important_option = config.get_main_option("my_important_option")
-# ... etc.
-
-
-def run_migrations_offline():
- """Run migrations in 'offline' mode.
-
- This configures the context with just a URL
- and not an Engine, though an Engine is acceptable
- here as well. By skipping the Engine creation
- we don't even need a DBAPI to be available.
-
- Calls to context.execute() here emit the given string to the
- script output.
-
- """
- url = config.get_main_option("sqlalchemy.url")
- context.configure(
- url=url,
- target_metadata=target_metadata,
- literal_binds=True,
- dialect_opts={"paramstyle": "named"},
- )
-
- with context.begin_transaction():
- context.run_migrations()
-
-
-def run_migrations_online():
- """Run migrations in 'online' mode.
-
- In this scenario we need to create an Engine
- and associate a connection with the context.
-
- """
- connectable = engine_from_config(
- config.get_section(config.config_ini_section),
- prefix="sqlalchemy.",
- poolclass=pool.NullPool,
- )
-
- with connectable.connect() as connection:
- context.configure(
- connection=connection, target_metadata=target_metadata
- )
-
- with context.begin_transaction():
- context.run_migrations()
-
-
-if context.is_offline_mode():
- run_migrations_offline()
-else:
- run_migrations_online()
diff --git a/chaind/old/db/migrations/default/script.py.mako b/chaind/old/db/migrations/default/script.py.mako
@@ -1,24 +0,0 @@
-"""${message}
-
-Revision ID: ${up_revision}
-Revises: ${down_revision | comma,n}
-Create Date: ${create_date}
-
-"""
-from alembic import op
-import sqlalchemy as sa
-${imports if imports else ""}
-
-# revision identifiers, used by Alembic.
-revision = ${repr(up_revision)}
-down_revision = ${repr(down_revision)}
-branch_labels = ${repr(branch_labels)}
-depends_on = ${repr(depends_on)}
-
-
-def upgrade():
- ${upgrades if upgrades else "pass"}
-
-
-def downgrade():
- ${downgrades if downgrades else "pass"}
diff --git a/chaind/old/db/migrations/default/versions/74e890aec7b0_session_tx_index.py b/chaind/old/db/migrations/default/versions/74e890aec7b0_session_tx_index.py
@@ -1,31 +0,0 @@
-"""Session tx index
-
-Revision ID: 74e890aec7b0
-Revises: 7ac591b16c68
-Create Date: 2021-08-26 10:51:53.651692
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '74e890aec7b0'
-down_revision = '7ac591b16c68'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
- op.create_table(
- 'session',
- sa.Column('id', sa.Integer, primary_key=True),
- sa.Column('otx_id', sa.Integer, sa.ForeignKey('otx.id'), nullable=False),
- sa.Column('session', sa.String(256), nullable=False),
- )
- op.create_index('idx_session', 'session', ['session', 'otx_id'], unique=True)
-
-
-def downgrade():
- op.drop_index('idx_session')
- op.drop_table('session')
diff --git a/chaind/old/db/migrations/default/versions/7ac591b16c68_chainqueue.py b/chaind/old/db/migrations/default/versions/7ac591b16c68_chainqueue.py
@@ -1,28 +0,0 @@
-"""chainqueue
-
-Revision ID: 7ac591b16c68
-Revises: b139fca16787
-Create Date: 2021-06-03 13:11:24.579148
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-from chainqueue.db.migrations.default.export import (
- chainqueue_upgrade,
- chainqueue_downgrade,
- )
-
-# revision identifiers, used by Alembic.
-revision = '7ac591b16c68'
-down_revision = 'b139fca16787'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
- chainqueue_upgrade()
-
-
-def downgrade():
- chainqueue_downgrade()
diff --git a/chaind/old/db/migrations/default/versions/b139fca16787_chainsyncer.py b/chaind/old/db/migrations/default/versions/b139fca16787_chainsyncer.py
@@ -1,28 +0,0 @@
-"""chainsyncer
-
-Revision ID: b139fca16787
-Revises:
-Create Date: 2021-06-03 13:09:23.731381
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-from chainsyncer.db.migrations.default.export import (
- chainsyncer_upgrade,
- chainsyncer_downgrade,
- )
-
-# revision identifiers, used by Alembic.
-revision = 'b139fca16787'
-down_revision = None
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
- chainsyncer_upgrade()
-
-
-def downgrade():
- chainsyncer_downgrade()
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
-chainlib>=0.1.0b1,<=0.1.0
-#chainqueue~=0.2.0
-#chainsyncer~=0.0.7
+chainlib~=0.1.0
+chainqueue~=0.1.0
+chainsyncer~=0.3.1
confini~=0.6.0
funga~=0.5.2
pyxdg~=0.26
diff --git a/setup.cfg b/setup.cfg
@@ -29,7 +29,8 @@ packages =
chaind
# chaind.sql
# chaind.runnable
- chainqueue.adapters
+ chaind.adapters
+ chaind.unittest
#[options.entry_points]
#console_scripts =
