Skip to content

Commit

Permalink
Merge 376fbc6 into 6aafd0d
Browse files Browse the repository at this point in the history
  • Loading branch information
slobodan-ilic committed Oct 12, 2018
2 parents 6aafd0d + 376fbc6 commit 5636de6
Show file tree
Hide file tree
Showing 30 changed files with 40 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ ENV/
*.~

# idea
.idea
.idea
7 changes: 7 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v1.4.0-1
hooks:
- id: flake8
- id: end-of-file-fixer
- id: trailing-whitespace
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017
Copyright (c) 2017

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ help:
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
13 changes: 6 additions & 7 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,16 @@
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ['sphinx.ext.autodoc',
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.doctest',
#'sphinx.ext.intersphinx',
# 'sphinx.ext.intersphinx',
'sphinx.ext.todo',
'sphinx.ext.ifconfig',
'sphinx.ext.viewcode',
#'sphinx.ext.githubpages'
#'sphinxcontrib.napoleon'
]
# 'sphinx.ext.githubpages'
# 'sphinxcontrib.napoleon'
]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
Expand Down Expand Up @@ -169,7 +170,5 @@
]




# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'https://docs.python.org/': None}
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@ not_skip = __init__.py
skip =
# We use tox for this project, so make sure to skip this directory
.tox

2 changes: 1 addition & 1 deletion tests/integration/fixtures/cubes/age-x-accrpipe.json
Original file line number Diff line number Diff line change
Expand Up @@ -994,4 +994,4 @@
"n": 8679
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1293,4 +1293,4 @@
"n": 1662
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -654,4 +654,4 @@
"n": 6
}
}
}
}
2 changes: 1 addition & 1 deletion tests/integration/fixtures/cubes/ca-x-mr-hs.json
Original file line number Diff line number Diff line change
Expand Up @@ -1293,4 +1293,4 @@
"n": 1662
}
}
}
}
2 changes: 1 addition & 1 deletion tests/integration/fixtures/cubes/ca-x-mr-weighted-hs.json
Original file line number Diff line number Diff line change
Expand Up @@ -1670,4 +1670,4 @@
],
"n": 1027
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -368,4 +368,4 @@
],
"element": "crunch:cube"
}
}
}
2 changes: 1 addition & 1 deletion tests/integration/fixtures/cubes/cat-x-cat-pruning-hs.json
Original file line number Diff line number Diff line change
Expand Up @@ -363,4 +363,4 @@
],
"n": 91
}
}
}
2 changes: 1 addition & 1 deletion tests/integration/fixtures/cubes/cat-x-mr-hs.json
Original file line number Diff line number Diff line change
Expand Up @@ -736,4 +736,4 @@
"n": 896
}
}
}
}
2 changes: 1 addition & 1 deletion tests/integration/fixtures/cubes/cat-x-mr-weighted-hs.json
Original file line number Diff line number Diff line change
Expand Up @@ -1670,4 +1670,4 @@
],
"n": 1027
}
}
}
2 changes: 1 addition & 1 deletion tests/integration/fixtures/cubes/cat-x-mr-x-cat.json
Original file line number Diff line number Diff line change
Expand Up @@ -10559,4 +10559,4 @@
"dataset_id": "be20e95c608e4f62b6d13c594f087c9d",
"description": ""
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1314,4 +1314,4 @@
"n": 1662
}
}
}
}
2 changes: 1 addition & 1 deletion tests/integration/fixtures/cubes/gender-x-weight.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,4 @@
"n": 208
}
}
}
}
2 changes: 1 addition & 1 deletion tests/integration/fixtures/cubes/mr-x-ca-with-hs.json
Original file line number Diff line number Diff line change
Expand Up @@ -860,4 +860,4 @@
"n": 6
}
}
}
}
2 changes: 1 addition & 1 deletion tests/integration/fixtures/cubes/mr-x-cat-hs.json
Original file line number Diff line number Diff line change
Expand Up @@ -736,4 +736,4 @@
"n": 896
}
}
}
}
2 changes: 1 addition & 1 deletion tests/integration/fixtures/cubes/mr-x-cat-x-mr-prune.json
Original file line number Diff line number Diff line change
Expand Up @@ -4663,4 +4663,4 @@
"n": 1662
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -510,4 +510,4 @@
"n": 1662
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -510,4 +510,4 @@
"n": 1662
}
}
}
}
2 changes: 1 addition & 1 deletion tests/integration/fixtures/cubes/scale_means/ca-x-mr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1387,4 +1387,4 @@
"n": 1662
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1030,4 +1030,4 @@
"n": 1662
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -299,4 +299,4 @@
],
"n": 1662
}
}
}
2 changes: 1 addition & 1 deletion tests/integration/fixtures/cubes/scale_means/cat-x-mr.json
Original file line number Diff line number Diff line change
Expand Up @@ -536,4 +536,4 @@
"n": 1644
}
}
}
}
2 changes: 1 addition & 1 deletion tests/integration/fixtures/cubes/scale_means/mr-x-cat.json
Original file line number Diff line number Diff line change
Expand Up @@ -536,4 +536,4 @@
"n": 1644
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,4 @@
"n": 1644
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1314,4 +1314,4 @@
"n": 1662
}
}
}
}

0 comments on commit 5636de6

Please sign in to comment.