Commit 2b3d3033 authored by Liubov Chuprikova's avatar Liubov Chuprikova
Browse files

New upstream version 2019.7.0

parent 466d04fd

.gitattributes

+1 −1
Original line number Diff line number Diff line 
q2cli/_version.py export-subst
 
qiime2/_version.py export-subst

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -63,3 +63,5 @@ target/ 


# vi

.*.swp



.DS_Store

.travis.yml

+1 −3
Original line number Diff line number Diff line
@@ -14,12 +14,10 @@ install: 
  - 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 nose

  - pip install -q flake8

  - conda install nose

  - pip install -q https://github.com/qiime2/q2lint/archive/master.zip

  - make install

script:

  - make lint

  - make test
 
  - QIIMETEST= source tab-qiime

  - QIIMETEST= qiime info

MANIFEST.in

+1 −1
Original line number Diff line number Diff line 
include versioneer.py

include q2cli/_version.py
 
include qiime2/_version.py

Makefile

+4 −4
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ test: all 
install: all

	$(PYTHON) setup.py install && \

	mkdir -p $(PREFIX)/etc/conda/activate.d && \

	cp hooks/50_activate_q2cli_tab_completion.sh $(PREFIX)/etc/conda/activate.d/

	cp hooks/00_activate_qiime2_envs.sh $(PREFIX)/etc/conda/activate.d/ && \

	mkdir -p $(PREFIX)/etc/conda/deactivate.d && \

	cp hooks/00_deactivate_qiime2_envs.sh $(PREFIX)/etc/conda/deactivate.d/



dev: all

	pip install -e . && \

	mkdir -p $(PREFIX)/etc/conda/activate.d && \

	cp hooks/50_activate_q2cli_tab_completion.sh $(PREFIX)/etc/conda/activate.d/

	pip install -e .



clean: distclean