Merge branch 'develop' into 2344_unit_aware_mapping_bug

SEED-platform · Aug 5, 2020 · 4654436 · 4654436
2 parents 7d8a308 + c444416
commit 4654436
Show file tree

Hide file tree

Showing 39 changed files with 891 additions and 965 deletions.
diff --git a/seed/api/v3/urls.py b/seed/api/v3/urls.py
@@ -54,7 +54,7 @@
 api_v3_router.register(r'labels', LabelViewSet, base_name='labels')
 api_v3_router.register(r'data_quality_checks', DataQualityCheckViewSet, base_name='data_quality_checks')
 api_v3_router.register(r'import_files', ImportFileViewSet, base_name='import_files')
-api_v3_router.register(r'measures', MeasureViewSet, base_name='import_files')
+api_v3_router.register(r'measures', MeasureViewSet, base_name='measures')
 api_v3_router.register(r'meters', MeterViewSet, base_name='meters')
 api_v3_router.register(r'organizations', OrganizationViewSet, base_name='organizations')
 api_v3_router.register(r'portfolio_manager', PortfolioManagerViewSet, base_name="portfolio_manager")

diff --git a/seed/data_importer/tests/views/__init__.py b/seed/data_importer/tests/views/__init__.py
diff --git a/seed/data_importer/tests/views/test_views.py b/seed/data_importer/tests/views/test_views.py
diff --git a/seed/data_importer/tests/views/test_views_dataset.py b/seed/data_importer/tests/views/test_views_dataset.py