Commit 2704bec5 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 2019.10.0

parent 7b94726b

.gitattributes

+1 −1
Original line number Diff line number Diff line 
q2cli/_version.py export-subst
 
q2templates/_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

  - conda install -q pytest

  - pip install -q flake8

  - 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 q2templates/_version.py

Makefile

+3 −8
Original line number Diff line number Diff line 
.PHONY: all lint test install dev clean distclean



PYTHON ?= python

PREFIX ?= $(CONDA_PREFIX)



all: ;
@@ -10,17 +9,13 @@ lint: 
	flake8



test: all

	QIIMETEST= nosetests

	py.test



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/

	$(PYTHON) setup.py install



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