make release-tag: Merge branch 'master' into stable

.travis.yml

@@ -1,6 +1,7 @@
-dist: xenial
+dist: bionic
 language: python
 python:
+  - 3.7
   - 3.6
   - 3.5
 
@@ -22,4 +23,4 @@ deploy:
     target-branch: gh-pages
     on:
       branch: master
-      python: 3.6
+      python: 3.7

HISTORY.md

@@ -1,5 +1,19 @@
 # History
 
+## 0.2.5 - 2020-07-29
+
+### Primitive Improvements
+
+* Accept timedelta `window_size` in `cutoff_window_sequences` - [Issue #239](https://github.com/HDI-Project/MLPrimitives/issues/239) by @joanvaquer
+
+### Bug Fixes
+
+* ImportError: Keras requires TensorFlow 2.2 or higher. Install TensorFlow via `pip install tensorflow` - [Issue #237](https://github.com/HDI-Project/MLPrimitives/issues/237) by @joanvaquer
+
+### New Primitives
+
++ Add `pandas.DataFrame.set_index` primitive - [Issue #222](https://github.com/HDI-Project/MLPrimitives/issues/222) by @JDTheRipperPC
+
 ## 0.2.4 - 2020-01-30
 
 ### New Primitives

Makefile

@@ -107,18 +107,34 @@ fix-lint: ## fix lint issues using autoflake, autopep8, and isort
 
 # TEST TARGETS
 
-.PHONY: test
-test: ## run tests quickly with the default Python
+.PHONY: test-unit
+test-unit: ## run tests quickly with the default Python
 	python -m pytest --cov=mlprimitives
 
-.PHONY: test-all
-test-all: ## run tests on every Python version with tox
-	tox -r
+.PHONY: test-readme
+test-readme: ## run the readme snippets
+	rm -rf tests/readme_test && mkdir tests/readme_test
+	cd tests/readme_test && rundoc run --single-session python3 -t python3 ../../README.md
+	rm -rf tests/readme_test
 
 .PHONY: test-pipelines
 test-pipelines: ## Test all the pipelines from the pipelines folder
 	mlprimitives test mlprimitives/pipelines/*.json
 
+.PHONY: test
+test: test-unit test-readme ## test everything that needs test dependencies
+
+.PHONY: check-dependencies
+check-dependencies: ## test if there are any broken dependencies
+	pip check
+
+.PHONY: test-devel
+test-devel: check-dependencies lint docs ## test everything that needs development dependencies
+
+.PHONY: test-all
+test-all: ## run tests on every Python version with tox
+	tox -r
+
 .PHONY: coverage
 coverage: ## check code coverage quickly with the default Python
 	coverage run --source mlprimitives -m pytest
@@ -133,7 +149,6 @@ coverage: ## check code coverage quickly with the default Python
 docs: clean-docs ## generate Sphinx HTML documentation, including API docs
 	sphinx-apidoc --module-first --separate -T -o docs/api/ mlprimitives
 	$(MAKE) -C docs html
-	touch docs/_build/html/.nojekyll
 
 .PHONY: view-docs
 view-docs: docs ## view docs in browser
@@ -152,12 +167,19 @@ dist: clean ## builds source and wheel package
 	python setup.py bdist_wheel
 	ls -l dist
 
-.PHONY: test-publish
-test-publish: dist ## package and upload a release on TestPyPI
+.PHONY: publish-confirm
+publish-confirm:
+	@echo "WARNING: This will irreversibly upload a new version to PyPI!"
+	@echo -n "Please type 'confirm' to proceed: " \
+		&& read answer \
+		&& [ "$${answer}" = "confirm" ]
+
+.PHONY: publish-test
+publish-test: dist publish-confirm ## package and upload a release on TestPyPI
 	twine upload --repository-url https://test.pypi.org/legacy/ dist/*
 
 .PHONY: publish
-publish: dist ## package and upload a release
+publish: dist publish-confirm ## package and upload a release
 	twine upload dist/*
 
 .PHONY: bumpversion-release
@@ -167,6 +189,13 @@ bumpversion-release: ## Merge master to stable and bumpversion release
 	bumpversion release
 	git push --tags origin stable
 
+.PHONY: bumpversion-release-test
+bumpversion-release-test: ## Merge master to stable and bumpversion release
+	git checkout stable || git checkout -b stable
+	git merge --no-ff master -m"make release-tag: Merge branch 'master' into stable"
+	bumpversion release --no-tag
+	@echo git push --tags origin stable
+
 .PHONY: bumpversion-patch
 bumpversion-patch: ## Merge stable to master and bumpversion patch
 	git checkout master
@@ -186,9 +215,21 @@ bumpversion-minor: ## Bump the version the next minor skipping the release
 bumpversion-major: ## Bump the version the next major skipping the release
 	bumpversion --no-tag major
 
+.PHONY: bumpversion-revert
+bumpversion-revert: ## Undo a previous bumpversion-release
+	git checkout master
+	git branch -D stable
+
+CLEAN_DIR := $(shell git status --short | grep -v ??)
 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)
 
+.PHONY: check-clean
+check-clean: ## Check if the directory has uncommitted changes
+ifneq ($(CLEAN_DIR),)
+	$(error There are uncommitted changes)
+endif
+
 .PHONY: check-master
 check-master: ## Check if we are in master branch
 ifneq ($(CURRENT_BRANCH),master)
@@ -202,14 +243,21 @@ ifeq ($(CHANGELOG_LINES),0)
 endif
 
 .PHONY: check-release
-check-release: check-master check-history ## Check if the release can be made
+check-release: check-clean 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-test
+release-test: check-release bumpversion-release-test publish-test bumpversion-revert
+
 .PHONY: release-candidate
 release-candidate: check-master publish bumpversion-candidate
 
+.PHONY: release-candidate-test
+release-candidate-test: check-clean check-master publish-test
+
 .PHONY: release-minor
 release-minor: check-release bumpversion-minor release