Sync with production env

[Waztom]

No description provided.

[lgtm-com]

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.

[garryod]

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

[garryod]

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

[garryod]

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]

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

[david-erb]

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? :)

[david-erb]

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?