Skip to content

Commit 0d57554

Browse files
committed
make release-tag: Merge branch 'master' into stable
2 parents 0725418 + 2add9dd commit 0d57554

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+3974
-663
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ docs/_build/
6767
docs/copulas.rst
6868
docs/copulas.*.rst
6969
docs/modules.rst
70+
docs/api/
7071

7172
# PyBuilder
7273
target/

.travis.yml

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,15 @@ python:
55
- 3.5
66

77
# Command to install dependencies
8-
install: pip install -U tox-travis
8+
install: pip install -U tox-travis codecov
99

1010
# Command to run tests
1111
script: tox
1212

13-
deploy:
13+
after_success: codecov
1414

15-
# Automatically deploy releases to PyPI for each tagged commit
16-
# Assuming you have installed the travis-ci CLI tool, after you
17-
# create the Github repo and add it to Travis, run the
18-
# following command to finish PyPI deployment setup:
19-
# $ travis encrypt MY_PYPI_PASSWORD
20-
# and then copy the (really long) encrypted password as shown.
21-
# - provider: pypi
22-
# distributions: sdist bdist_wheel
23-
# user: dai_lab_mit
24-
# password:
25-
# secure: "TnqNnauWBoQXaq+S0i2sBxSyKWfn9I2+b2p5le8Y19AkZ5JI+1dHBrZU+SoI7DwLXqfudgVLke2bLStVS+T1b5UOpdABaHEkVKzYwlQRD8AXh/844HCJ3SwZpqmRidcu1f7mlEtvzq9Q3x8lNuXpY1qTHaEq7BKs/ZsInLfqvSWz7RmzYrv/VW27ELwWmQq8d9U/Uw0Ww/FyjxGiep4qf0pkTuZWWn1Og6RJMZ9uB/slfrdzlLuAdTc2Evml3nrNCm3gzpSe8/9jchHbqq+3XRnOamkBF984vROasEGv2rxM5W1xII6N4jA8MNz0PQu0yAiXcl8M58d9oFXSDaX2hfCeYUQPGMCi0upxyIYsOgW9gz5H/fe45dgjsMg9FxJsUBcGNAJHkT0z2rRWKtauGQnhWZFGannc54OzbY1BfMF7Af4jFaz7i6OoNUjKgJdRnShfwCpxAb76HPd4myK/yLG9n/vMFRdF0fnrPVRRFDdsEpjoYUFSdnnTnAasWNaJ8Xt4yYk1M3LeBgo55MajDMyKP9ENHBEEZbgvpjIsHczeZLXUCDqUcED1PHmqA+z4oX08ntUuWK9FD7G3AbbvllsGqJK7IYfuX8PL77OfioDZYYwNqlGaiTdLEK1j7IkiCSkpmODVJznUAYgnJu2u2rSvQ1xfWkrzykmYQ0GYcLw="
26-
# on:
27-
# tags: true
28-
# branch: stable
29-
# repo: DAI-Lab/Copulas
30-
# python: 3.6
15+
deploy:
3116

32-
# Automatically build and deploy documentation to GitHub Pages after every
33-
# commit
34-
# Follow the instructions at https://docs.travis-ci.com/user/deployment/pages/
35-
# to setup a personal deployment token and then provide it as a secure
36-
# environment variable at https://travis-ci.org/DAI-Lab/Copulas/settings
3717
- provider: pages
3818
skip-cleanup: true
3919
github-token: "$GITHUB_TOKEN"

AUTHORS.rst

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
=======
21
Credits
32
=======
43

4+
Development Lead
5+
----------------
6+
* Kalyan Veeramachaneni <kalyan@csail.mit.edu>
7+
* (Alicia)Yi Sun <yis@mit.edu>
8+
59
Contributors
610
------------
711

12+
* Manuel Alvarez <manuel@pythiac.com>
13+
* Carles Sala <carles@pythiac.com>
814
* Andrew Montanez <amontane@mit.edu>
9-
* (Alicia)Yi Sun <yis@mit.edu>
10-
* Kalyan Veeramachaneni <kalyan@csail.mit.edu>
11-
* Manuel Alvarez <manuel@pythiac.com>
15+
* paulolimac <paulolimac@gmail.com>

HISTORY.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
# History
22

3+
## 0.2.2 (2019-07-31)
4+
5+
### New Features
6+
7+
* `truncnorm` distribution and a generic wrapper for `scipy.rv_continous` distributions - Issue [#27](https://github.com/DAI-Lab/Copulas/issues/27) by @amontanez, @csala and @ManuelAlvarezC
8+
* `Independence` bivariate copulas - Issue [#46](https://github.com/DAI-Lab/Copulas/issues/46) by @aliciasun, @csala and @ManuelAlvarezC
9+
* Option to select seed on random number generator - Issue [#63](https://github.com/DAI-Lab/Copulas/issues/63) by @echo66 and @ManuelAlvarezC
10+
* Option on Vine copulas to select number of rows to sample - Issue [#77](https://github.com/DAI-Lab/Copulas/issues/77) by @ManuelAlvarezC
11+
* Make copulas accept both scalars and arrays as arguments - Issues [#85](https://github.com/DAI-Lab/Copulas/issues/85) and [#90](https://github.com/DAI-Lab/Copulas/issues/90) by @ManuelAlvarezC
12+
13+
### General Improvements
14+
15+
* Ability to properly handle constant data - Issues [#57](https://github.com/DAI-Lab/Copulas/issues/57) and [#82](https://github.com/DAI-Lab/Copulas/issues/82) by @csala and @ManuelAlvarezC
16+
* Tests for analytics properties of copulas - Issue [#61](https://github.com/DAI-Lab/Copulas/issues/61) by @ManuelAlvarezC
17+
* Improved documentation - Issue [#96](https://github.com/DAI-Lab/Copulas/issues/96) by @ManuelAlvarezC
18+
19+
### Bugs fixed
20+
21+
* Fix bug on Vine copulas, that made it crash during the bivariate copula selection - Issue [#64](https://github.com/DAI-Lab/Copulas/issues/64) by @echo66 and @ManuelAlvarezC
22+
323
## 0.2.1 - Vine serialization
424

525
* Add serialization to Vine copulas.

Makefile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ clean-pyc: ## remove Python file artifacts
4949

5050
.PHONY: clean-docs
5151
clean-docs: ## remove previously built docs
52+
rm -f docs/api/*.rst
5253
-$(MAKE) -C docs clean 2>/dev/null # this fails if sphinx is not yet installed
5354

5455
.PHONY: clean-coverage
@@ -88,6 +89,10 @@ lint: ## check style with flake8 and isort
8889
flake8 copulas tests examples
8990
isort -c --recursive copulas tests examples
9091

92+
lint-docs: ## check docs formatting with doc8 and pydocstyle
93+
doc8 . docs/
94+
pydocstyle copulas/
95+
9196
.PHONY: fix-lint
9297
fix-lint: ## fix lint issues using autoflake, autopep8, and isort
9398
find copulas -name '*.py' | xargs autoflake --in-place --remove-all-unused-imports --remove-unused-variables
@@ -124,8 +129,8 @@ coverage: ## check code coverage quickly with the default Python
124129

125130
.PHONY: docs
126131
docs: clean-docs ## generate Sphinx HTML documentation, including API docs
132+
sphinx-apidoc --separate -o docs/api/ copulas
127133
$(MAKE) -C docs html
128-
touch docs/_build/html/.nojekyll
129134

130135
.PHONY: view-docs
131136
view-docs: docs ## view docs in browser
@@ -154,7 +159,7 @@ publish: dist ## package and upload a release
154159

155160
.PHONY: bumpversion-release
156161
bumpversion-release: ## Merge master to stable and bumpversion release
157-
git checkout stable
162+
git checkout stable || git checkout -b stable
158163
git merge --no-ff master -m"make release-tag: Merge branch 'master' into stable"
159164
bumpversion release
160165
git push --tags origin stable
@@ -174,8 +179,8 @@ bumpversion-minor: ## Bump the version the next minor skipping the release
174179
bumpversion-major: ## Bump the version the next major skipping the release
175180
bumpversion --no-tag major
176181

177-
CURRENT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
178-
CHANGELOG_LINES := $(shell git diff HEAD..stable HISTORY.md | wc -l)
182+
CURRENT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
183+
CHANGELOG_LINES := $(shell git diff HEAD..origin/stable HISTORY.md 2>&1 | wc -l)
179184

180185
.PHONY: check-release
181186
check-release: ## Check if the release can be made

0 commit comments

Comments
 (0)