Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to astropy 5.0.3 #145

Merged
merged 5 commits into from
Mar 30, 2022
Merged

Upgrade to astropy 5.0.3 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e8cd03
Refactored gitignore media folders
sebastian-aranda Mar 30, 2022
3b7f832
Docker-compose has conflicts with .dockerignore, see https://github.c…
sebastian-aranda Mar 30, 2022
01bcb0b
Upgrade astropy 4.0 -> 5.0.3
sebastian-aranda Mar 30, 2022
b0be2e1
Include tests on ticket branches too
sebastian-aranda Mar 30, 2022
6cddad2
Fix to use correct model WorkspaceView
sebastian-aranda Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ pipeline {
branch "bugfix/*"
branch "hotfix/*"
branch "release/*"
branch "tickets/*"
branch "PR-*"
}
}
Expand Down
2 changes: 0 additions & 2 deletions docker/.dockerignore
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion manager/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion manager/ui_framework/tests/tests_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down