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

Jump to bottom

Refactor/station deps #32

Merged
merged 28 commits into from
May 20, 2022
Merged

Refactor/station deps #32

merged 28 commits into from
May 20, 2022

Conversation

dandavies99
Copy link
Contributor

In principle, this PR should update all references to models in the Station app. Starting from scratch (no db and migrations) I am able to make all initial migrations and start the server running with no errors (i.e. simply docker-compose).

Closes #13

dalonsoa and others added 26 commits May 20, 2022 08:44
@dalonsoa @dandavies99
Update institutional header
6285d53
@dalonsoa @dandavies99
Add menu contents to JSON file
f64cc96
@dalonsoa @dandavies99
Replace menu_struc for a function that reads json
14c0d44
@dalonsoa @dandavies99
Simplify get user menu
b9c54c6
@dalonsoa @dandavies99
Remove home/admin as it is not required
be39ad6
@dalonsoa @dandavies99
Ignore import not used warning
64902a1
@dalonsoa @dandavies99
Keep flake8 happy
2de05b2
@dalonsoa @dandavies99
Document home/context_processor.py
3cf1984
@dalonsoa @dandavies99
Document and remove functions in home/functions.py
10a170d
@dalonsoa @dandavies99
Remove signals form home, as they are not really needed
7db8490
@dalonsoa @dandavies99
Explicit imports from home.vies in url
7596411
@dalonsoa @dandavies99
Clean up home/vies.py a bit
efed27c
@dalonsoa @dandavies99
Keep flake8 happy with line length
ae0b429
@dalonsoa @dandavies99
Run isort in home/
74d620e
@dalonsoa @dandavies99
Remove import home.signals from home/apps
22c160c
@dandavies99
Move apps to subdir
9f9a4d3
@dandavies99
exclude unused apps from isort
72aa6a3
@dandavies99
keep isort happy after move
d4c75f5
@dandavies99
Update imports
7a57d5b
@dandavies99
replace model name in other apps
4a3d2a7
@dandavies99
Further replacements
63f7d54
@dandavies99
more swaps
1717550
@dandavies99
Keep isort happy
1d7415c
@dandavies99
few more translations
824b83b
@dandavies99
merge develop into refactor/station-deps
1d906e6
@dandavies99
Merge branch 'develop' into refactor/station-deps
f1e869a
@dandavies99 dandavies99 requested a review from dalonsoa May 20, 2022 10:47
dalonsoa
dalonsoa requested changes May 20, 2022
View reviewed changes
Copy link
Collaborator

@dalonsoa dalonsoa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most likely, this will cause conflicts in a couple of places, but it needs to be done and, hopefully, they will be easy to fix.

@dandavies99 dandavies99 mentioned this pull request May 20, 2022
Merged
@dandavies99 @dalonsoa
Apply suggestions from code review
28bffe4 
Co-authored-by: Diego Alonso Álvarez <d.alonso-alvarez@imperial.ac.uk>
@dandavies99 dandavies99 requested a review from dalonsoa May 20, 2022 12:34
@dandavies99
Copy link
Contributor Author

Some well-spotted parts I'd missed there! The stuff relating to Cruce should be resolved in #33 anyway.

@dandavies99 dandavies99 merged commit 90ff9c0 into develop May 20, 2022
@dandavies99 dandavies99 deleted the refactor/station-deps branch May 26, 2022 12:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dalonsoa dalonsoa dalonsoa approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Refactor estacion.apps.EstacionConfig
2 participants
@dandavies99 @dalonsoa