diff --git a/docs/v1_documentation/catalog_to_catalog/append_to_sdss_id.py b/docs/v1_documentation/catalog_to_catalog/append_to_sdss_id.py index 59db25af..fb1a2a09 100644 --- a/docs/v1_documentation/catalog_to_catalog/append_to_sdss_id.py +++ b/docs/v1_documentation/catalog_to_catalog/append_to_sdss_id.py @@ -7,12 +7,15 @@ # @License: BSD 3-clause (http://www.opensource.org/licenses/BSD-3-Clause) import os + import peewee -from peewee import fn, JOIN +from create_catalogidx_to_catalogidy import (MetaXMatch, TempMatch, + UniqueMatch, + create_unique_from_region) +from peewee import JOIN, fn + +from sdssdb.peewee.sdss5db.catalogdb import Catalog, database -from sdssdb.peewee.sdss5db.catalogdb import database, Catalog -from create_catalogidx_to_catalogidy import MetaXMatch, create_unique_from_region -from create_catalogidx_to_catalogidy import TempMatch, UniqueMatch database.connect(dbname="sdss5db", user="sdss_user") diff --git a/docs/v1_documentation/catalog_to_catalog/create_catalogidx_to_catalogidy.py b/docs/v1_documentation/catalog_to_catalog/create_catalogidx_to_catalogidy.py index ebd386a1..3a8bd405 100644 --- a/docs/v1_documentation/catalog_to_catalog/create_catalogidx_to_catalogidy.py +++ b/docs/v1_documentation/catalog_to_catalog/create_catalogidx_to_catalogidy.py @@ -16,10 +16,12 @@ from peewee import fn from playhouse.postgres_ext import ArrayField -from sdssdb.peewee.sdss5db.catalogdb import database, Catalog +from sdssdb.peewee.sdss5db.catalogdb import Catalog, database from sdssdb.peewee.sdss5db.targetdb import Target + import target_selection + database.connect(dbname='sdss5db', user="sdss_user") # Use 'sdss' to get read/write permissions diff --git a/python/target_selection/append_to_sdss_id.py b/python/target_selection/append_to_sdss_id.py index 59db25af..fb1a2a09 100644 --- a/python/target_selection/append_to_sdss_id.py +++ b/python/target_selection/append_to_sdss_id.py @@ -7,12 +7,15 @@ # @License: BSD 3-clause (http://www.opensource.org/licenses/BSD-3-Clause) import os + import peewee -from peewee import fn, JOIN +from create_catalogidx_to_catalogidy import (MetaXMatch, TempMatch, + UniqueMatch, + create_unique_from_region) +from peewee import JOIN, fn + +from sdssdb.peewee.sdss5db.catalogdb import Catalog, database -from sdssdb.peewee.sdss5db.catalogdb import database, Catalog -from create_catalogidx_to_catalogidy import MetaXMatch, create_unique_from_region -from create_catalogidx_to_catalogidy import TempMatch, UniqueMatch database.connect(dbname="sdss5db", user="sdss_user") diff --git a/python/target_selection/create_catalogidx_to_catalogidy.py b/python/target_selection/create_catalogidx_to_catalogidy.py index ebd386a1..3a8bd405 100644 --- a/python/target_selection/create_catalogidx_to_catalogidy.py +++ b/python/target_selection/create_catalogidx_to_catalogidy.py @@ -16,10 +16,12 @@ from peewee import fn from playhouse.postgres_ext import ArrayField -from sdssdb.peewee.sdss5db.catalogdb import database, Catalog +from sdssdb.peewee.sdss5db.catalogdb import Catalog, database from sdssdb.peewee.sdss5db.targetdb import Target + import target_selection + database.connect(dbname='sdss5db', user="sdss_user") # Use 'sdss' to get read/write permissions