Commit ccd3317d authored by Mathieu Courcelles's avatar Mathieu Courcelles

Merge branch 'dev' into 'master'

Dev

See merge request !25
parents dde1eb48 5dd82031
Pipeline #18966310 passed with stages
in 1 minute and 39 seconds
No preview for this file type
# Copyright 2013-2017 Mathieu Courcelles
# Mike Tyers's lab / IRIC / Universite de Montreal
"""
Admin module for the CLMSVault.
Act as the GUI to interact with the pipeline.
Copyright 2013-2018 Mathieu Courcelles
CAPA - Center for Advanced Proteomics Analyses
Mike Tyers's lab
Thibault's lab
IRIC - Universite de Montreal
"""
# Import standard libraries
......@@ -288,6 +288,8 @@ class CLPeptideAdmin(admin.ModelAdmin):
paginator = FasterAdminPaginator
raw_id_fields = ('dataset', 'fs_prot1_id', 'fs_prot2_id')
search_fields = ('run_name', 'scan_number', 'display_protein1',
'peptide1', 'peptide_wo_mod1',
'display_protein2', 'peptide2', 'peptide_wo_mod2')
......
# -*- coding: utf-8 -*-
# Generated by Django 1.11.8 on 2018-01-05 15:52
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('CLMSVault_app', '0018_auto_20171220_0903'),
]
operations = [
migrations.AlterField(
model_name='clpeptide',
name='notes',
field=models.CharField(blank=True, max_length=100, null=True),
),
]
"""
Copyright 2013-2017 Mathieu Courcelles
CAPA - Center for Advanced Proteomics Analyses and Thibault's lab
Copyright 2013-2018 Mathieu Courcelles
CAPA - Center for Advanced Proteomics Analyses
Mike Tyers's lab
Thibault's lab
IRIC - Universite de Montreal
Data model module for the CLMSVault_app.
"""
# Import standard libraries
......@@ -427,7 +427,8 @@ class CLPeptide(AdminURLMixin, models.Model):
rejected = models.BooleanField(default=False)
notes = models.CharField(max_length=100)
notes = models.CharField(blank=True, null=True,
max_length=100)
LINK_TYPE_CHOICES = (
('Inter-protein', 'Inter-protein'),
......
copy .\CLMSVault\settings\local_.py .\CLMSVault\settings\local.py
conda create -n CLMSVault python=2.7 --yes --file requirements/base_win.txt
conda create -n CLMSVault python=3.6 --yes --file requirements/base_win.txt
activate CLMSVault
\ No newline at end of file
CLMSVault 2017/07/24 - Windows 7 installation instruction
CLMSVault 2018/03/15 - Windows 7 installation instruction
---------------------------------------------
1. Download and install Anaconda Python 2.7 (https://www.continuum.io/downloads).
1. Download and install Anaconda Python 3.6 (https://www.continuum.io/downloads).
2. Extract CLMSVault zip archive to C:\CLMSVault
......
Django==1.7
MySQL-python==1.2.5
biopython==1.64
numpy==1.9.1
scipy==0.16.0
pytz==2014.7
\ No newline at end of file
biopython==1.69
Django==1.11.8
numpy==1.13.3
pytz==2017.3
scipy==1.0.0
django-grappelli==2.6.1
Unipath==1.0
django-debug-toolbar==1.8
django-defender==0.5.1
django-grappelli==2.10.1
django-settings-export==1.2.1
django-xforwardedfor-middleware==2.0
mysqlclient==1.3.12
python-json-logger==0.1.8
raven==6.3.0
Unipath==1.1
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment