Commit 663ac1a7 authored by Liubov Chuprikova's avatar Liubov Chuprikova
Browse files

New upstream version 2019.7.0+dfsg

parent 2c585634

.travis.yml

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ before_install: 
  - conda update -q conda

  - conda info -a

install:

  - wget -q https://raw.githubusercontent.com/qiime2/environment-files/master/latest/staging/qiime2-latest-py35-linux-conda.yml

  - conda env create -q -n test-env --file qiime2-latest-py35-linux-conda.yml

  - wget -q https://raw.githubusercontent.com/qiime2/environment-files/master/latest/staging/qiime2-latest-py36-linux-conda.yml

  - conda env create -q -n test-env --file qiime2-latest-py36-linux-conda.yml

  - source activate test-env

  - conda install -q pytest

  - pip install -q flake8

q2templates/_version.py

+3 −3
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ def get_keywords(): 
    # setup.py/versioneer.py will grep for the variable names, so they must

    # each be defined on a line of their own. _version.py will just call

    # get_keywords().

    git_refnames = " (tag: 2019.4.0)"

    git_full = "fd0f3bb97cfd9c136a150418ce0bb8e260f7e9b3"

    git_date = "2019-05-03 04:14:46 +0000"

    git_refnames = " (tag: 2019.7.0)"

    git_full = "b9219ae56491b2bd01389ce298f77bb3a9cee46a"

    git_date = "2019-07-30 18:15:56 +0000"

    keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}

    return keywords

q2templates/templates/assets/css/base-template.css

0 → 100644
+13 −0
Original line number Diff line number Diff line 
/*

----------------------------------------------------------------------------

Copyright (c) 2016-2019, QIIME 2 development team.



Distributed under the terms of the Modified BSD License.



The full license is in the file LICENSE, distributed with this software.

----------------------------------------------------------------------------

*/



table.dataframe thead th, table.dataframe td{

  text-align: center;

}

q2templates/templates/base.html

+2 −1
Original line number Diff line number Diff line
@@ -7,13 +7,14 @@ 
    <title>{% block title %}{{ q2templates_default_page_title }}{% endblock %}</title>

    <link rel="stylesheet" href="./q2templateassets/css/bootstrap.min.css"/>

    <link rel="stylesheet" href="./q2templateassets/css/normalize.css"/>

    <link rel="stylesheet" href="./q2templateassets/css/base-template.css"/>

    <script src="./q2templateassets/js/jquery-3.2.0.min.js" charset="utf-8"></script>

    <script src="./q2templateassets/js/bootstrap.min.js" charset="utf-8"></script>

    {% block head %}

    {% endblock %}

  </head>

  <body>

    <div class="container-fluid">

    <div class="container{% block fixed %}-fluid{% endblock %}">

      <div id="q2templatesheader" class="row">

        <div class="col-lg-12">

          <a href="http://qiime2.org/">