Skip to content
Snippets Groups Projects
Commit fc9df15f authored by Fabien  MAREUIL's avatar Fabien MAREUIL
Browse files

Merge branch 'master' into 'release'

Prepare for v1.1.2

See merge request !31
parents 72bfe69f 33b53201
No related branches found
No related tags found
2 merge requests!53Clean code,!31Prepare for v1.1.2
Pipeline #53608 failed
...@@ -61,7 +61,8 @@ test-centos7: ...@@ -61,7 +61,8 @@ test-centos7:
- coverage run --source='.' manage.py test - coverage run --source='.' manage.py test
- coverage report - coverage report
- coverage html - coverage html
- pip3.6 install sphinx sphinx-argparse sphinxcontrib.bibtex sphinx_rtd_theme - export LC_CTYPE="en_US.UTF-8"
- pip3.6 install sphinx==3.5.2 sphinx-argparse==0.2.5 sphinxcontrib.bibtex==2.1.4 sphinx_rtd_theme==0.5.1
- cd docs - cd docs
- PYTHON=python3.6 make html - PYTHON=python3.6 make html
artifacts: artifacts:
......
...@@ -60,6 +60,7 @@ extensions = [ ...@@ -60,6 +60,7 @@ extensions = [
"sphinxcontrib.bibtex", "sphinxcontrib.bibtex",
] ]
# Add any paths that contain templates here, relative to this directory. # Add any paths that contain templates here, relative to this directory.
templates_path = ["_templates"] templates_path = ["_templates"]
...@@ -69,6 +70,9 @@ templates_path = ["_templates"] ...@@ -69,6 +70,9 @@ templates_path = ["_templates"]
# source_suffix = ['.rst', '.md'] # source_suffix = ['.rst', '.md']
source_suffix = ".rst" source_suffix = ".rst"
# The encoding of all reST source files.
source_encoding = "utf-8-sig"
# The master toctree document. # The master toctree document.
master_doc = "index" master_doc = "index"
......
...@@ -179,6 +179,7 @@ class CavityAdmin(admin.ModelAdmin): ...@@ -179,6 +179,7 @@ class CavityAdmin(admin.ModelAdmin):
@admin.register(Distance) @admin.register(Distance)
class DistanceAdmin(admin.ModelAdmin): class DistanceAdmin(admin.ModelAdmin):
list_display = ("similiarity_between", "distance") list_display = ("similiarity_between", "distance")
search_fields = ("cavity1__full_name", "cavity2__full_name")
def similiarity_between(self, obj): def similiarity_between(self, obj):
return "{} and {}".format(obj.cavity1.full_name, obj.cavity2.full_name) return "{} and {}".format(obj.cavity1.full_name, obj.cavity2.full_name)
......
...@@ -114,6 +114,7 @@ class ChainSerializer(serializers.ModelSerializer): ...@@ -114,6 +114,7 @@ class ChainSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = Chain model = Chain
fields = ( fields = (
"id",
"pdb_chain_id", "pdb_chain_id",
"protein", "protein",
"pdb", "pdb",
......
...@@ -602,7 +602,7 @@ class TestGetUniprotInfo(TestCase): ...@@ -602,7 +602,7 @@ class TestGetUniprotInfo(TestCase):
"GO_0005886", "GO_0005886",
"GO_0005905", "GO_0005905",
"GO_0010008", "GO_0010008",
"GO_0030665", "GO_0030669",
"GO_0031253", "GO_0031253",
"GO_0042470", "GO_0042470",
"GO_0045171", "GO_0045171",
......
...@@ -4,9 +4,9 @@ flake8 ...@@ -4,9 +4,9 @@ flake8
black black
flake8-black flake8-black
# documentation generation # documentation generation
sphinx Sphinx==3.5.2
sphinx_rtd_theme sphinx_rtd_theme==0.5.1
sphinxcontrib-bibtex sphinxcontrib-bibtex==2.1.4
# coverage # coverage
coverage coverage
# tests # tests
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment