From 5308c2cc521a95d658dc8131d64d174381f55b8c Mon Sep 17 00:00:00 2001 From: Michael Krotscheck Date: Mon, 9 Jun 2014 12:42:05 -0700 Subject: [PATCH] Removed PostGres from code and documentation We don't support postgres. Change-Id: Ia51300c1aa1042ae32f966490ce4265d49fab255 --- doc/source/install/manual.rst | 8 ++------ storyboard/tests/db/migration/test_migrations.conf | 2 -- storyboard/tests/db/migration/test_migrations_base.py | 4 +--- test-requirements.txt | 1 - 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/doc/source/install/manual.rst b/doc/source/install/manual.rst index ab05fd69..e17459bb 100644 --- a/doc/source/install/manual.rst +++ b/doc/source/install/manual.rst @@ -16,15 +16,11 @@ Installing the API service $ pip install storyboard 2. By default Storyboard will use SQLite driver which is suitable only for - development mode. Storyboard supports MySQL and PostgreSQL backends. - To install MySQL driver execute:: + development mode. Storyboard only supports MySQL, to install MySQL driver + execute:: $ pip install MySQL-python - To install PostgreSQL driver execute:: - - $ pip install psycopg2 - 3. Edit ``/etc/storyboard/storyboard.conf``. You'll need to modify ``connection`` parameter in the ``[database]`` section. diff --git a/storyboard/tests/db/migration/test_migrations.conf b/storyboard/tests/db/migration/test_migrations.conf index 9cf6ed75..4e5948ef 100644 --- a/storyboard/tests/db/migration/test_migrations.conf +++ b/storyboard/tests/db/migration/test_migrations.conf @@ -7,7 +7,6 @@ #sqlite=sqlite:// #sqlitefile=sqlite:///test_migrations_utils.db mysql=mysql+mysqldb://storyboard:storyboard@localhost/test_migrations_utils -#postgresql=postgresql+psycopg2://user:pass@localhost/test_migrations_utils [migration_dbs] # Migration DB details are listed separately as they can't be connected to @@ -19,7 +18,6 @@ mysql=mysql+mysqldb://storyboard:storyboard@localhost/test_migrations_utils #sqlite=sqlite:// #sqlitefile=sqlite:///test_migrations.db #mysql=mysql+mysqldb://user:pass@localhost/test_migrations -#postgresql=postgresql+psycopg2://user:pass@localhost/test_migrations [walk_style] snake_walk=yes diff --git a/storyboard/tests/db/migration/test_migrations_base.py b/storyboard/tests/db/migration/test_migrations_base.py index ed4c610c..d314d395 100644 --- a/storyboard/tests/db/migration/test_migrations_base.py +++ b/storyboard/tests/db/migration/test_migrations_base.py @@ -51,9 +51,7 @@ def _get_connect_string(backend, user, passwd, database): these then we'll run the tests, otherwise they are skipped """ - if backend == "postgres": - backend = "postgresql+psycopg2" - elif backend == "mysql": + if backend == "mysql": backend = "mysql+mysqldb" else: raise Exception("Unrecognized backend: '%s'" % backend) diff --git a/test-requirements.txt b/test-requirements.txt index b7a0680c..279a9e65 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -14,7 +14,6 @@ posix_ipc>=0.9.8 # Some of the tests use real MySQL and Postgres databases MySQL-python -psycopg2 # Doc requirements sphinx>=1.1.2,<1.2