Skip to content

Commit a9cee34

Browse files
committed
make release-tag: Merge branch 'master' into stable
2 parents e8f0658 + 8041ccf commit a9cee34

File tree

163 files changed

+9096
-4116
lines changed

Some content is hidden

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

163 files changed

+9096
-4116
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ docs/copulas.rst
6868
docs/copulas.*.rst
6969
docs/modules.rst
7070
docs/api/
71+
docs/tutorials/
7172

7273
# PyBuilder
7374
target/

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
# Config file for automatic testing at travis-ci.org
2-
dist: xenial
2+
dist: bionic
33
language: python
44
python:
55
- 3.7
66
- 3.6
77
- 3.5
88

99
# Command to install dependencies
10+
addons:
11+
apt:
12+
packages:
13+
- pandoc
1014
install: pip install -U tox-travis codecov
1115

1216
# Command to run tests

AUTHORS.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ Credits
33

44
* Manuel Alvarez <manuel@pythiac.com>
55
* Carles Sala <carles@pythiac.com>
6-
* José David Pérez <jose@pythiac.com>
76
* (Alicia)Yi Sun <yis@mit.edu>
7+
* José David Pérez <jose@pythiac.com>
8+
* Kevin Alex Zhang <kevz@mit.edu>
89
* Andrew Montanez <amontane@mit.edu>
910
* Kalyan Veeramachaneni <kalyan@csail.mit.edu>
1011
* paulolimac <paulolimac@gmail.com>

HISTORY.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
# History
22

3-
## 0.2.5 (2019-01-17)
3+
## 0.3.0 (2020-03-27)
4+
5+
Important revamp of the internal implementation of the project, the testing
6+
infrastructure and the documentation by Kevin Alex Zhang @k15z, Carles Sala
7+
@csala and Kalyan Veeramachaneni @kveerama
8+
9+
## Enhancements
10+
11+
* Reimplementation of the existing Univariate distributions.
12+
* Addition of new Beta and Gamma Univariates.
13+
* New Univariate API with automatic selection of the optimal distribution.
14+
* Several improvements and fixes on the Bivariate and Multivariate Copulas implementation.
15+
* New visualization module with simple plotting patterns to visualize probability distributions.
16+
* New datasets module with toy datasets sampling functions.
17+
* New testing infrastructure with end-to-end, numerical and large scale testing.
18+
* Improved tutorials and documentation.
19+
20+
## 0.2.5 (2020-01-17)
421

522
### General Improvements
623

Makefile

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ clean-pyc: ## remove Python file artifacts
5050
.PHONY: clean-docs
5151
clean-docs: ## remove previously built docs
5252
rm -f docs/api/*.rst
53+
rm -rf docs/tutorials
5354
-$(MAKE) -C docs clean 2>/dev/null # this fails if sphinx is not yet installed
5455

5556
.PHONY: clean-coverage
@@ -86,8 +87,8 @@ install-develop: clean-build clean-pyc ## install the package in editable mode a
8687

8788
.PHONY: lint
8889
lint: ## check style with flake8 and isort
89-
flake8 copulas tests examples
90-
isort -c --recursive copulas tests examples
90+
flake8 copulas tests
91+
isort -c --recursive copulas tests
9192

9293
lint-docs: ## check docs formatting with doc8 and pydocstyle
9394
doc8 . docs/
@@ -103,19 +104,23 @@ fix-lint: ## fix lint issues using autoflake, autopep8, and isort
103104
autopep8 --in-place --recursive --aggressive tests
104105
isort --apply --atomic --recursive tests
105106

106-
find examples -name '*.py' | xargs autoflake --in-place --remove-all-unused-imports --remove-unused-variables
107-
autopep8 --in-place --recursive --aggressive examples
108-
isort --apply --atomic --recursive examples
109-
110107
# TEST TARGETS
111108

112109
.PHONY: test
113110
test: ## run tests quickly with the default Python
114-
python -m pytest --cov=copulas
111+
python -m pytest --disable-warnings --cov=copulas
112+
113+
.PHONY: test-unit
114+
test-unit: ## run tests quickly with the default Python
115+
python -m pytest --disable-warnings --cov=copulas tests/unit
116+
117+
.PHONY: test-numerical
118+
test-numerical: ## run tests quickly with the default Python
119+
python -m pytest --disable-warnings --cov=copulas tests/numerical
115120

116121
.PHONY: test-all
117122
test-all: ## run tests on every Python version with tox
118-
tox
123+
tox -r
119124

120125
.PHONY: coverage
121126
coverage: ## check code coverage quickly with the default Python
@@ -129,6 +134,7 @@ coverage: ## check code coverage quickly with the default Python
129134

130135
.PHONY: docs
131136
docs: clean-docs ## generate Sphinx HTML documentation, including API docs
137+
cp -r tutorials docs/tutorials
132138
sphinx-apidoc --separate -o docs/api/ copulas
133139
$(MAKE) -C docs html
134140

@@ -171,6 +177,10 @@ bumpversion-patch: ## Merge stable to master and bumpversion patch
171177
bumpversion --no-tag patch
172178
git push
173179

180+
.PHONY: bumpversion-candidate
181+
bumpversion-candidate: ## Bump the version to the next candidate
182+
bumpversion candidate --no-tag
183+
174184
.PHONY: bumpversion-minor
175185
bumpversion-minor: ## Bump the version the next minor skipping the release
176186
bumpversion --no-tag minor
@@ -180,22 +190,30 @@ bumpversion-major: ## Bump the version the next major skipping the release
180190
bumpversion --no-tag major
181191

182192
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)
193+
CHANGELOG_LINES := $(shell git diff HEAD..origin/stable HISTORY.md 2>&1 | wc -l)
184194

185-
.PHONY: check-release
186-
check-release: ## Check if the release can be made
195+
.PHONY: check-master
196+
check-master: ## Check if we are in master branch
187197
ifneq ($(CURRENT_BRANCH),master)
188198
$(error Please make the release from master branch\n)
189199
endif
200+
201+
.PHONY: check-history
202+
check-history: ## Check if HISTORY.md has been modified
190203
ifeq ($(CHANGELOG_LINES),0)
191204
$(error Please insert the release notes in HISTORY.md before releasing)
192-
else
193-
@echo "A new release can be made"
194205
endif
195206

207+
.PHONY: check-release
208+
check-release: check-master check-history ## Check if the release can be made
209+
@echo "A new release can be made"
210+
196211
.PHONY: release
197212
release: check-release bumpversion-release publish bumpversion-patch
198213

214+
.PHONY: release-candidate
215+
release-candidate: check-master publish bumpversion-candidate
216+
199217
.PHONY: release-minor
200218
release-minor: check-release bumpversion-minor release
201219

0 commit comments

Comments
 (0)