Skip to content

Commit

Permalink
[MAJOR, WIP] Using Pipenv, stable javabridge, node-sass, yarn and more (
Browse files Browse the repository at this point in the history
HelikarLab#13)

* [MAJOR] Using Pipenv, stable javabridge, node-sass, yarn and more

* Remove python development versions from .travis.yml

* Remove unwanted ignores from .gitignore

* [FIX] Direct git.io to develop branch

* [FIX] Add sudo priviledges for Travis CI

* [FIX] Fixed R installation for get-candis

* [FIX] Use Travis CI container

* [FIX] Auto Agree Oracle JDK License

* [FIX] Add popen args and R testing

* [FIX] Fix R installation with upgrading package list

* [FIX] Fix R installation with installing dependencies

* [FIX] Fix R installation with installing dependencies

* [FIX] Install graphviz-dev package
  • Loading branch information
achillesrasquinha authored Feb 18, 2018
1 parent 4712aaf commit e935d72
Show file tree
Hide file tree
Showing 19 changed files with 1,376 additions and 10,100 deletions.
9 changes: 0 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
# env
.env

# virtualenv
.venv
venv

# docs
docs/build

# Dependencies
node_modules
bower_components
Gemfile.lock

# Logs
npm-debug.log
Expand Down
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ python:
- "3.3"
- "3.4"
- "3.5"
- "3.5-dev"
# - "3.5-dev"
- "3.6"
- "3.6-dev"
- "3.7-dev"
# - "3.6-dev"
# - "3.7-dev"
install:
- curl -sL bit.do/get-candis | python
- curl -sL git.io/install-candis | sudo python
4 changes: 0 additions & 4 deletions .vscode/settings.json

This file was deleted.

3 changes: 0 additions & 3 deletions Gemfile

This file was deleted.

24 changes: 6 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ include .env

BASEDIR = $(realpath .)
MODULE = candis

SOURCEDIR = $(realpath $(MODULE))
DOCSDIR = $(realpath docs)

VIRTUALENV = virtualenv
PIPENV ?= pipenv
PYBINARIES = $(shell pipenv --venv)/bin
PYTHON ?= $(PYBINARIES)/python

VENV = venv
PYBINARIES = $(VENV)/bin

PYTHON = $(PYBINARIES)/python
PIP = $(PYBINARIES)/pip
Expand All @@ -24,12 +25,6 @@ NODE_MODULES = $(BASEDIR)/node_modules
NODEBINARIES = $(NODE_MODULES)/.bin

YARN ?= yarn
BUNDLER ?= bundler

venv:
pip3 install $(VIRTUALENV)

$(VIRTUALENV) $(VENV) --python python3

clean.py:
$(PYTHON) setup.py clean
Expand All @@ -48,15 +43,8 @@ clean.force:
make clean

install:
cat $(BASEDIR)/requirements/*.txt > $(BASEDIR)/requirements-dev.txt
cat $(BASEDIR)/requirements/production.txt > $(BASEDIR)/requirements.txt

$(PIP) install numpy
$(PIP) install -r $(BASEDIR)/requirements-dev.txt

$(YARN) install

$(BUNDLER) install
$(PIPENV) install
$(YARN) install

$(PYTHON) setup.py develop

Expand Down
45 changes: 45 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
[[source]]

url = "https://pypi.python.org/simple"
verify_ssl = true
name = "pypi"


[packages]

addict = "*"
pyyaml = "*"
ipython = "*"
requests = "*"
numpy = "*"
scipy = "*"
matplotlib = "*"
pandas = "*"
seaborn = "*"
"rpy2" = "*"
liac-arff = "*"
cython = "*"
javabridge = "*"
"python-weka-wrapper3" = "*"
pygraphviz = "*"
pillow = "*"
flask = "*"
django-htmlmin = "*"
flask-socketio = "*"
redis = "*"
rq = "*"
gunicorn = "*"


[dev-packages]

jupyter = "*"
honcho = "*"
pytest = "*"
coverage = "*"
pylint = "*"


[requires]

python_version = "3.6"
Loading

0 comments on commit e935d72

Please sign in to comment.