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 Sep 24, 2019
2 parents cbd65be + ccb6fb8 commit 43b7b25
Show file tree
Hide file tree
Showing 32 changed files with 884 additions and 658 deletions.
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ instance/

# Sphinx documentation
docs/_build/
docs/api/
docs/rdt.rst
docs/rdt.*.rst
docs/modules.rst
Expand Down Expand Up @@ -109,6 +110,3 @@ ENV/

# Vim
.*.swp

# demo data
examples/data/airbnb
30 changes: 6 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,21 @@
# Config file for automatic testing at travis-ci.org
dist: xenial
language: python
python:
- 3.7
- 3.6
- 3.5

# Command to install dependencies
install: pip install -U tox-travis
install: pip install -U tox-travis codecov

# Command to run tests
script: tox

deploy:
after_success: codecov

# Automatically deploy releases to PyPI for each tagged commit
# Assuming you have installed the travis-ci CLI tool, after you
# create the Github repo and add it to Travis, run the
# following command to finish PyPI deployment setup:
# $ travis encrypt MY_PYPI_PASSWORD
# and then copy the (really long) encrypted password as shown.
# - provider: pypi
# distributions: sdist bdist_wheel
# user: dai_lab_mit
# password:
# secure: "TnqNnauWBoQXaq+S0i2sBxSyKWfn9I2+b2p5le8Y19AkZ5JI+1dHBrZU+SoI7DwLXqfudgVLke2bLStVS+T1b5UOpdABaHEkVKzYwlQRD8AXh/844HCJ3SwZpqmRidcu1f7mlEtvzq9Q3x8lNuXpY1qTHaEq7BKs/ZsInLfqvSWz7RmzYrv/VW27ELwWmQq8d9U/Uw0Ww/FyjxGiep4qf0pkTuZWWn1Og6RJMZ9uB/slfrdzlLuAdTc2Evml3nrNCm3gzpSe8/9jchHbqq+3XRnOamkBF984vROasEGv2rxM5W1xII6N4jA8MNz0PQu0yAiXcl8M58d9oFXSDaX2hfCeYUQPGMCi0upxyIYsOgW9gz5H/fe45dgjsMg9FxJsUBcGNAJHkT0z2rRWKtauGQnhWZFGannc54OzbY1BfMF7Af4jFaz7i6OoNUjKgJdRnShfwCpxAb76HPd4myK/yLG9n/vMFRdF0fnrPVRRFDdsEpjoYUFSdnnTnAasWNaJ8Xt4yYk1M3LeBgo55MajDMyKP9ENHBEEZbgvpjIsHczeZLXUCDqUcED1PHmqA+z4oX08ntUuWK9FD7G3AbbvllsGqJK7IYfuX8PL77OfioDZYYwNqlGaiTdLEK1j7IkiCSkpmODVJznUAYgnJu2u2rSvQ1xfWkrzykmYQ0GYcLw="
# on:
# tags: true
# branch: stable
# repo: HDI-Project/RDT
# python: 3.6
deploy:

# Automatically build and deploy documentation to GitHub Pages after every
# commit
# Follow the instructions at https://docs.travis-ci.com/user/deployment/pages/
# to setup a personal deployment token and then provide it as a secure
# environment variable at https://travis-ci.org/HDI-Project/RDT/settings
- provider: pages
skip-cleanup: true
github-token: "$GITHUB_TOKEN"
Expand All @@ -42,4 +24,4 @@ deploy:
target-branch: gh-pages
on:
branch: stable
python: 3.6
python: 3.7
9 changes: 4 additions & 5 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
Credits
=======

Contributors
------------

* Andrew Montanez <[email protected]>
* Manuel Alvarez <[email protected]>
* Carles Sala <[email protected]>
* José David Pérez <[email protected]>
* Kalyan Veeramachaneni <[email protected]>
* Manuel Alvarez <[email protected]>
* Andrew Montanez <[email protected]>
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ The process of releasing a new version involves several steps combining both ``g
these changes are committed and available in ``master`` branch.
Normally this is just a list of the Pull Requests that have been merged since the latest version.

Once this is done, just run the following commands::
Once this is done, just run the following commands:

1. If you are releasing a patch version::

Expand Down
15 changes: 15 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# History

## 0.1.3 - 2019-09-24

### New Features

* Add attributes NullTransformer and col_meta. - Issue [#30](https://github.com/HDI-Project/RDT/issues/30) by @ManuelAlvarezC

### General Improvements

* Integrate with CodeCov - Issue [#89](https://github.com/HDI-Project/RDT/issues/89) by @csala
* Remake Sphinx Documentation - Issue [#96](https://github.com/HDI-Project/RDT/issues/96) by @JDTheRipperPC
* Improve README - Issue [#92](https://github.com/HDI-Project/RDT/issues/92) by @JDTheRipperPC
* Document RELEASE workflow - Issue [#93](https://github.com/HDI-Project/RDT/issues/93) by @JDTheRipperPC
* Add support to Python 3.7 - Issue [#38](https://github.com/HDI-Project/RDT/issues/38) by @ManuelAlvarezC
* Create way to pass HyperTransformer table dict - Issue [#45](https://github.com/HDI-Project/RDT/issues/45) by @ManuelAlvarezC

## 0.1.2

* Add a numerical transformer for positive numbers.
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ include CONTRIBUTING.rst
include HISTORY.md
include LICENSE
include README.md
include RELEASE.md

recursive-include tests *
recursive-exclude * __pycache__
Expand Down
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ clean-pyc: ## remove Python file artifacts

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

.PHONY: clean-coverage
Expand Down Expand Up @@ -107,7 +108,7 @@ test: ## run tests quickly with the default Python

.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 @@ -121,8 +122,8 @@ coverage: ## check code coverage quickly with the default Python

.PHONY: docs
docs: clean-docs ## generate Sphinx HTML documentation, including API docs
sphinx-apidoc --separate -T -o docs/api/ rdt
$(MAKE) -C docs html
touch docs/_build/html/.nojekyll

.PHONY: view-docs
view-docs: docs ## view docs in browser
Expand Down Expand Up @@ -171,8 +172,8 @@ 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

CURRENT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
CHANGELOG_LINES := $(shell git diff HEAD..stable HISTORY.md | wc -l)
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-release
check-release: ## Check if the release can be made
Expand Down
Loading

0 comments on commit 43b7b25

Please sign in to comment.