Skip to content

Commit

Permalink
Merge pull request #4 from Korijn/switch_tosetuptools
Browse files Browse the repository at this point in the history
Switch to setuptools
  • Loading branch information
ivoflipse authored Apr 24, 2018
2 parents a003a56 + d8033ac commit 6c89a45
Show file tree
Hide file tree
Showing 23 changed files with 400 additions and 793 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -214,3 +214,7 @@ pip-log.txt

#Mr Developer
.mr.developer.cfg

.vscode/
.pytest_cache/
__pycache__/
33 changes: 5 additions & 28 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,10 @@
language: python
python:
# We don't actually use the Travis Python, but this keeps it organized.
- "2.7"
- "3.5"
- "3.6"
install:
- sudo apt-get update
# We do this conditionally because it saves us some downloading if the
# version is the same.
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
else
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
fi
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
# some required packages
- conda install conda-build jinja2 anaconda-client --quiet
# Useful for debugging any issues with conda
- conda info -a

# Replace dep1 dep2 ... with your dependencies
- conda env create
- source activate numpy_indexed

- pip install pipenv --upgrade
- pipenv install --dev --system --skip-lock
script:
# Your test script goes here
- invoke test
- invoke build
- python setup.py sdist
- PYTHONPATH=. pytest
- python setup.py bdist_wheel
163 changes: 0 additions & 163 deletions LICENSE.md

This file was deleted.

3 changes: 0 additions & 3 deletions MANIFEST.in

This file was deleted.

14 changes: 14 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[[source]]
url = "https://pypi.python.org/simple"
verify_ssl = true
name = "pypi"

[packages]
numpy = "*"
future = "*"

[dev-packages]
pytest = "*"
matplotlib = "*"
wheel = "*"
setuptools = "*"
Loading

0 comments on commit 6c89a45

Please sign in to comment.