Skip to content

Sync with production env#154

Open
Waztom wants to merge 1 commit intomasterfrom
dlssync
Open

Sync with production env#154
Waztom wants to merge 1 commit intomasterfrom
dlssync

Conversation

@Waztom
Copy link
Copy Markdown

@Waztom Waztom commented Dec 2, 2022

No description provided.

@lgtm-com
Copy link
Copy Markdown

lgtm-com bot commented Dec 2, 2022

This pull request introduces 7 alerts and fixes 10 when merging 3996f4d into f5606aa - view on LGTM.com

new alerts:

  • 5 for 'import *' may pollute namespace
  • 2 for Unused import

fixed alerts:

  • 9 for 'import *' may pollute namespace
  • 1 for Unused import

Heads-up: LGTM.com's PR analysis will be disabled on the 5th of December, and LGTM.com will be shut down ⏻ completely on the 16th of December 2022. Please enable GitHub code scanning, which uses the same CodeQL engine ⚙️ that powers LGTM.com. For more information, please check out our post on the GitHub blog.

Copy link
Copy Markdown

@garryod garryod left a comment

Choose a reason for hiding this comment

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

The xchem_db directory seems to mirror what we have at xchem/xchem_db. We should use a git submodule in place of replication. Comparing them I get the following diff:

diff -r local_xchem_db/requirements.txt xchem_db/requirements.txt
7a8
> pygraphviz==1.6
10c11
< sqlparse==0.4.1
---
> sqlparse==0.4.1
\ No newline at end of file
Only in local_xchem_db/: routers.py
Only in local_xchem_db/xchem_db: routers.py

@@ -1,31 +0,0 @@
[VerneConfig]
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Not sure why this has been deleted, would be have the empty one on the repo

Comment on lines +14 to +19
# Warren added - to get instance on Diamond in sync with Git repo
luigi.log
*.cif
mArh.json
bkup/*
#.nfs00000000a33355f40000008a
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Suggested change
# Warren added - to get instance on Diamond in sync with Git repo
luigi.log
*.cif
mArh.json
bkup/*
#.nfs00000000a33355f40000008a
luigi.log
*.cif

mArh.json & bkup/ can be removed locally

@garryod
Copy link
Copy Markdown

garryod commented Dec 14, 2022

The xchem_db directory seems to mirror what we have at xchem/xchem_db. We should use a git submodule in place of replication. Comparing them I get the following diff:

diff -r local_xchem_db/requirements.txt xchem_db/requirements.txt
7a8
> pygraphviz==1.6
10c11
< sqlparse==0.4.1
---
> sqlparse==0.4.1
\ No newline at end of file
Only in local_xchem_db/: routers.py
Only in local_xchem_db/xchem_db: routers.py

To track what was discussed offline; xchem_db should be made a python dependency of this project once the diffs with routers are understood

Copy link
Copy Markdown

@david-erb david-erb left a comment

Choose a reason for hiding this comment

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

It looks like settings_docker_django.py got moved to xchem_db/xchem_db/settings.py.

But this settings file has lost the ability to talk to the production server, namely

'HOST': 'ispybdbproxy.diamond.ac.uk',

Or maybe I am just confused? :)


# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'u4mgin$vk3g!q%lq4vqp(u3g9=pyy5x95cosp)+%rfh%$p#z%y'
SECRET_KEY = '7!%=0w@rmjou1bo63u81$57u8^x%snfz&*11@l&3+&&824cm5e'
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Should we hide this secret key from being published here on github?

Maybe the whole settings file should be tracked elsewhere than with the source?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants