Fix package data install, and test discovery in package name (#18)

clintval · Dec 28, 2018 · cafa0c8 · cafa0c8
1 parent a566573
commit cafa0c8
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 cache: pip
 python:
   - 3.6
+
 install:
   - sudo apt-get update
   - wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
@@ -10,12 +11,17 @@ install:
   - hash -r
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
-  - conda install virtualenv
   - conda info -a
+  - conda install virtualenv
   - pip install codecov tox-travis
+  - pip install requests jinja2 anaconda-client
+
 script:
   - tox
+  - conda build conda-recipe
+
 after_success:
   - codecov
+
 notifications:
   email: false
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,5 +2,6 @@ include README.md
 include LICENSE
 include docs/CONTRIBUTING.md
 recursive-include docs *.rst
+recursive-include snakescale/wrappers Snakefile
 recursive-include snakescale/wrappers *.yml *.yaml *.py
-recursive-include snakescale/wrappers *.bed *.genome
+recursive-include snakescale/wrappers *.bed *.genome
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -1,13 +1,13 @@
 {% set name = "snakescale" %}
-{% set version = "0.4.0" %}
+{% set version = "0.5.0" %}
 
 package:
   name: "{{ name|lower }}"
   version: "{{ version }}"
 
 source:
   url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
-  sha256: 4cf5b989aef26491a618d8fa3339f936da16f6a9e4237f8fe6a94e4ae34d0540
+  sha256: 473f5757a422219f97a3f04429c84d8a65d4eac8779601563fe94c3948400d31
 
 build:
   number: 0
@@ -29,7 +29,7 @@ about:
   license_family: MIT
   license_file: 
   summary: Non-strict wrappers for the data pipelining language Snakemake.
-  doc_url: 
+  doc_url: http://snakescale.readthedocs.io/
   dev_url: 
 
 extra:

diff --git a/docs/conf.py b/docs/conf.py
@@ -18,9 +18,9 @@
 author = 'clintval'
 
 # The short X.Y version
-version = '0.4'
+version = '0.5'
 # The full version, including alpha/beta/rc tags
-release = '0.4.0'
+release = '0.5.0'
 
 # -- General configuration ---------------------------------------------------
 

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 from pathlib import Path
 
 PACKAGE = 'snakescale'
-VERSION = '0.4.0'
+VERSION = '0.5.0'
 
 setuptools.setup(
     name=PACKAGE,
@@ -19,6 +19,7 @@
     license='MIT',
     zip_safe=False,
     packages=find_packages(),
+    include_package_data=True,
     install_requires=['snakemake>=4.5.1'],
     keywords='snakemake pipeline wrapper',
     classifiers=[
@@ -30,6 +31,6 @@
     ],
     project_urls={
         'Documentation': f'https://{PACKAGE}.readthedocs.io',
-        'Issue-Tracker': f'https://github.com/clintval/{PACKAGE}/issues',
+        'Issue Tracker': f'https://github.com/clintval/{PACKAGE}/issues',
     },
 )
diff --git a/snakescale/wrappers/__init__.py b/snakescale/wrappers/__init__.py
diff --git a/tests/conftest.py b/tests/conftest.py
diff --git a/tox.ini b/tox.ini
@@ -89,10 +89,10 @@ warn_return_any = True
 warn_redundant_casts = True
 
 [pytest]
-testpaths = 
+testpaths =
+    tests
     docs
     snakescale
-    tests
 addopts =
     --cov=snakescale
     --cov-config tox.ini
@@ -103,6 +103,16 @@ addopts =
     --doctest-rst
     --doctest-glob '*.rst'
     --show-capture=no
+norecursedirs =
+    '.*'
+    'build'
+    'dist'
+    'CVS'
+    '_darcs'
+    '{arch}'
+    '*.egg'
+    'venv'
+    'wrappers'
 doctest_plus = enabled
 doctest_optionflags = NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL
 mock_use_standalone_module = true