Merge pull request #145 from lsst-ts/tickets/LOVE-96

Upgrade to astropy 5.0.3
lsst-ts · Mar 30, 2022 · a5cbad9 · a5cbad9
2 parents f2818db + 6cddad2
commit a5cbad9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,11 +9,5 @@ webpack-stats.*
 **/__pycache__
 **/.DS_Store
 **/db_data
-
-# preserve folder structure with dummy gitinclude file
-manager/config/**
-!manager/config/.gitinclude
-manager/media/thumbnails/**
-!manager/media/thumbnails/.gitinclude
-manager/ui_framework/tests/media/thumbnails/**
-!manager/ui_framework/tests/media/thumbnails/.gitinclude
+**/media/configs
+**/media/thumbnails
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -70,6 +70,7 @@ pipeline {
           branch "bugfix/*"
           branch "hotfix/*"
           branch "release/*"
+          branch "tickets/*"
           branch "PR-*"
         }
       }

diff --git a/docker/.dockerignore b/docker/.dockerignore
diff --git a/manager/requirements.txt b/manager/requirements.txt
@@ -2,7 +2,7 @@ aioredis==1.3.1
 alabaster==0.7.12
 asgiref==3.3.1
 asn1crypto==1.3.0
-astropy==4.0
+astropy==5.0.3
 async-timeout==3.0.1
 atomicwrites==1.3.0
 attrs==19.3.0

diff --git a/manager/ui_framework/tests/tests_models.py b/manager/ui_framework/tests/tests_models.py
@@ -385,7 +385,7 @@ def test_delete_workspace_view(self):
             "The number of objects in the DB have decreased by 1",
         )
         with self.assertRaises(Exception):
-            Workspace.objects.get(pk=self.workspace_view_pk)
+            WorkspaceView.objects.get(pk=self.workspace_view_pk)
 
 
 class WorkspaceAndViewsRelationsTestCase(TestCase):