Skip to content

Commit

Permalink
make release-tag: Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
csala committed Mar 28, 2020
2 parents e8f0658 + 8041ccf commit a9cee34
Show file tree
Hide file tree
Showing 163 changed files with 9,096 additions and 4,116 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ docs/copulas.rst
docs/copulas.*.rst
docs/modules.rst
docs/api/
docs/tutorials/

# PyBuilder
target/
Expand Down
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
# Config file for automatic testing at travis-ci.org
dist: xenial
dist: bionic
language: python
python:
- 3.7
- 3.6
- 3.5

# Command to install dependencies
addons:
apt:
packages:
- pandoc
install: pip install -U tox-travis codecov

# Command to run tests
Expand Down
3 changes: 2 additions & 1 deletion AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ Credits

* Manuel Alvarez <[email protected]>
* Carles Sala <[email protected]>
* José David Pérez <[email protected]>
* (Alicia)Yi Sun <[email protected]>
* José David Pérez <[email protected]>
* Kevin Alex Zhang <[email protected]>
* Andrew Montanez <[email protected]>
* Kalyan Veeramachaneni <[email protected]>
* paulolimac <[email protected]>
19 changes: 18 additions & 1 deletion HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
# History

## 0.2.5 (2019-01-17)
## 0.3.0 (2020-03-27)

Important revamp of the internal implementation of the project, the testing
infrastructure and the documentation by Kevin Alex Zhang @k15z, Carles Sala
@csala and Kalyan Veeramachaneni @kveerama

## Enhancements

* Reimplementation of the existing Univariate distributions.
* Addition of new Beta and Gamma Univariates.
* New Univariate API with automatic selection of the optimal distribution.
* Several improvements and fixes on the Bivariate and Multivariate Copulas implementation.
* New visualization module with simple plotting patterns to visualize probability distributions.
* New datasets module with toy datasets sampling functions.
* New testing infrastructure with end-to-end, numerical and large scale testing.
* Improved tutorials and documentation.

## 0.2.5 (2020-01-17)

### General Improvements

Expand Down
44 changes: 31 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ clean-pyc: ## remove Python file artifacts
.PHONY: clean-docs
clean-docs: ## remove previously built docs
rm -f docs/api/*.rst
rm -rf docs/tutorials
-$(MAKE) -C docs clean 2>/dev/null # this fails if sphinx is not yet installed

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

.PHONY: lint
lint: ## check style with flake8 and isort
flake8 copulas tests examples
isort -c --recursive copulas tests examples
flake8 copulas tests
isort -c --recursive copulas tests

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

find examples -name '*.py' | xargs autoflake --in-place --remove-all-unused-imports --remove-unused-variables
autopep8 --in-place --recursive --aggressive examples
isort --apply --atomic --recursive examples

# TEST TARGETS

.PHONY: test
test: ## run tests quickly with the default Python
python -m pytest --cov=copulas
python -m pytest --disable-warnings --cov=copulas

.PHONY: test-unit
test-unit: ## run tests quickly with the default Python
python -m pytest --disable-warnings --cov=copulas tests/unit

.PHONY: test-numerical
test-numerical: ## run tests quickly with the default Python
python -m pytest --disable-warnings --cov=copulas tests/numerical

.PHONY: test-all
test-all: ## run tests on every Python version with tox
tox
tox -r

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

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

Expand Down Expand Up @@ -171,6 +177,10 @@ bumpversion-patch: ## Merge stable to master and bumpversion patch
bumpversion --no-tag patch
git push

.PHONY: bumpversion-candidate
bumpversion-candidate: ## Bump the version to the next candidate
bumpversion candidate --no-tag

.PHONY: bumpversion-minor
bumpversion-minor: ## Bump the version the next minor skipping the release
bumpversion --no-tag minor
Expand All @@ -180,22 +190,30 @@ bumpversion-major: ## Bump the version the next major skipping the release
bumpversion --no-tag major

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

.PHONY: check-release
check-release: ## Check if the release can be made
.PHONY: check-master
check-master: ## Check if we are in master branch
ifneq ($(CURRENT_BRANCH),master)
$(error Please make the release from master branch\n)
endif

.PHONY: check-history
check-history: ## Check if HISTORY.md has been modified
ifeq ($(CHANGELOG_LINES),0)
$(error Please insert the release notes in HISTORY.md before releasing)
else
@echo "A new release can be made"
endif

.PHONY: check-release
check-release: check-master check-history ## Check if the release can be made
@echo "A new release can be made"

.PHONY: release
release: check-release bumpversion-release publish bumpversion-patch

.PHONY: release-candidate
release-candidate: check-master publish bumpversion-candidate

.PHONY: release-minor
release-minor: check-release bumpversion-minor release

Expand Down
Loading

0 comments on commit a9cee34

Please sign in to comment.