Initialise the populations package and update references.

2 files changed, 6 insertions, 11 deletions

diff --git a/uploader/expression_data/rqtl2.py b/uploader/expression_data/rqtl2.py
index 975fc1f..a855699 100644
--- a/uploader/expression_data/rqtl2.py
+++ b/uploader/expression_data/rqtl2.py
@@ -36,11 +36,9 @@ from uploader.authorisation import require_login
 from uploader.db.platforms import platform_by_id, platforms_by_species
 from uploader.db.averaging import averaging_methods, averaging_method_by_id
 from uploader.db.tissues import all_tissues, tissue_by_id, create_new_tissue
-from uploader.db import (
-    species_by_id,
-    save_population,
-    populations_by_species,
-    population_by_species_and_id,)
+from uploader.population.models import (save_population,
+                                        populations_by_species,
+                                        population_by_species_and_id)
 from uploader.species.models import species_by_id
 from uploader.db.datasets import (
     geno_dataset_by_id,
diff --git a/uploader/expression_data/samples.py b/uploader/expression_data/samples.py
index 0715d14..d430aa9 100644
--- a/uploader/expression_data/samples.py
+++ b/uploader/expression_data/samples.py
@@ -28,13 +28,10 @@ from uploader.db_utils import (
     with_db_connection,
     database_connection,
     with_redis_connection)
-from uploader.db import (
-    species_by_id,
-    save_population,
-    population_by_id,
-    populations_by_species,
-    species as fetch_species)
 from uploader.species.models import species_by_id, all_species as fetch_species
+from uploader.population.models import(save_population,
+                                       population_by_id,
+                                       populations_by_species)
 
 samples = Blueprint("samples", __name__)