From e19bc8d8e3302cc48fe1d71a703d37dd63b24ba3 Mon Sep 17 00:00:00 2001 From: Gabriele Girelli Date: Wed, 29 May 2019 14:24:32 +0200 Subject: [PATCH 1/3] Removed version flag from footer (kept forgetting to update it). --- ifpd/sections/probe_design/views/footer.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ifpd/sections/probe_design/views/footer.tpl b/ifpd/sections/probe_design/views/footer.tpl index 536ce60..5dc412b 100644 --- a/ifpd/sections/probe_design/views/footer.tpl +++ b/ifpd/sections/probe_design/views/footer.tpl @@ -1,7 +1,7 @@
From c2b8641744b2438714ace201a1eacd7828eb154c Mon Sep 17 00:00:00 2001 From: Gabriele Girelli Date: Thu, 11 Jul 2019 16:12:35 +0200 Subject: [PATCH 2/3] Update classifiers Added trove classifier specifying that the package is supported for Python 3.6 --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 58b8bfe..1d731ac 100644 --- a/setup.py +++ b/setup.py @@ -27,6 +27,7 @@ 'Topic :: Scientific/Engineering :: Bio-Informatics', 'License :: OSI Approved :: MIT License', 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3.6' ], keywords='biology cell DNA RNA FISH fluorescence hybridization bioimaging genome', packages=["ifpd", "ifpd.sections", "ifpd.sections.probe_design"], @@ -61,4 +62,4 @@ }, test_suite="nose.collector", tests_require=["nose"], -) \ No newline at end of file +) From 8a98f227f2b97f3cb3f50d1b24f63b5bb3c82e33 Mon Sep 17 00:00:00 2001 From: Gabriele Girelli Date: Wed, 24 Jul 2019 14:24:08 +0200 Subject: [PATCH 3/3] Fixed bug related to CUSTOM database tags --- CHANGELOG.md | 8 +++++++ .../sections/probe_design/views/databases.tpl | 22 +++++++++++-------- setup.py | 2 +- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ad2da0..b81c111 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. +## [2.0.3.post1] - 2019-07-24 +### Fixed +- Bug crashing interface when no CUSTOM flags are present in a database. + + + ## [2.0.3] - 2019-05-29 ### Added - Option to easily add google analytics tokens to design interface. @@ -114,6 +120,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [0.0.1] - 2017-08-06 - First release + +[2.0.3.post1] https://github.com/ggirelli/iFISH-probe-design/releases/tag/v2.0.3.post1 [2.0.3] https://github.com/ggirelli/iFISH-probe-design/releases/tag/v2.0.3 [2.0.2] https://github.com/ggirelli/iFISH-probe-design/releases/tag/v2.0.2 [2.0.1] https://github.com/ggirelli/iFISH-probe-design/releases/tag/v2.0.1 diff --git a/ifpd/sections/probe_design/views/databases.tpl b/ifpd/sections/probe_design/views/databases.tpl index b39ca05..26664d4 100644 --- a/ifpd/sections/probe_design/views/databases.tpl +++ b/ifpd/sections/probe_design/views/databases.tpl @@ -33,18 +33,22 @@
  • Overlapping oligos: {{config['OLIGOS']['overlaps']}}
  • - %for k in [k for k in config['CUSTOM'].keys() if not k in ['reference', 'url']]: -
  • - {{k}}: {{config['CUSTOM'][k]}} -
  • + %if "CUSTOM" in config.keys(): + %for k in [k for k in config['CUSTOM'].keys() if not k in ['reference', 'url']]: +
  • + {{k}}: {{config['CUSTOM'][k]}} +
  • + %end %end
    - %if 'reference' in config['CUSTOM'].keys(): -

    Reference: {{config['CUSTOM']['reference']}}

    - %end - %if 'url' in config['CUSTOM'].keys(): - Database link + %if "CUSTOM" in config.keys(): + %if 'reference' in config['CUSTOM'].keys(): +

    Reference: {{config['CUSTOM']['reference']}}

    + %end + %if 'url' in config['CUSTOM'].keys(): + Database link + %end %end
    diff --git a/setup.py b/setup.py index 58b8bfe..96c6303 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ long_description = f.read() setup(name='ifpd', - version='2.0.3', + version='2.0.3.post1', description='''An iFISH probe design pipeline, with web interface included.''', long_description=long_description, long_description_content_type='text/markdown',