Skip to content

Commit

Permalink
Prepare for 0.1.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
csala committed Apr 23, 2020
1 parent 38dc254 commit 509a39f
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 25 deletions.
9 changes: 2 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
dist: trusty
dist: bionic
language: python
python:
- 3.6

matrix:
include:
- python: 3.7
dist: xenial
sudo: required
- 3.7

# Command to install dependencies
install: pip install -U tox-travis codecov
Expand Down
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ include HISTORY.md
include LICENSE
include README.md

recursive-include orion *.json

recursive-include tests *
recursive-exclude * __pycache__
recursive-exclude * *.py[co]
Expand Down
20 changes: 17 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,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 @@ -123,20 +127,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..stable HISTORY.md 2>/dev/null | 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)
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
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,14 +232,16 @@ The output will be a table in the format described above:
Once we have the data, let us try to use the LSTM pipeline to analyze it and search for anomalies.

In order to do so, we will have import the `orion.analysis.analyze` function and pass it
the train and test dataframes and the path to the pipeline JSON that we want to use:
the train and test dataframes and the name of the pipeline that we want to use:

```python3
from orion.analysis import analyze

pipeline_path = 'orion/pipelines/lstm_dynamic_threshold.json'

anomalies = analyze(pipeline_path, train, test)
anomalies = analyze(
pipeline='lstm_dynamic_threshold',
train=train,
test=test
)
```

**NOTE:** Depending on your system and the exact versions that you might have installed
Expand Down
2 changes: 1 addition & 1 deletion orion/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

__author__ = """MIT Data To AI Lab"""
__email__ = 'dailabmit@gmail.com'
__version__ = '0.1.0-dev'
__version__ = '0.1.0.dev0'

import os

Expand Down
Empty file added orion/primitives/__init__.py
Empty file.
19 changes: 11 additions & 8 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
[bumpversion]
current_version = 0.1.0-dev
current_version = 0.1.0.dev0
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
serialize =
{major}.{minor}.{patch}-{release}
{major}.{minor}.{patch}
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<candidate>\d+))?
serialize =
{major}.{minor}.{patch}.{release}{candidate}
{major}.{minor}.{patch}

[bumpversion:part:release]
optional_value = release
values =
dev
release
first_value = dev
values =
dev
release

[bumpversion:part:candidate]

[bumpversion:file:setup.py]
search = version='{current_version}'
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@
license="MIT license",
long_description=readme + '\n\n' + history,
long_description_content_type='text/markdown',
name='orion',
name='orion-ml',
packages=find_packages(include=['orion', 'orion.*']),
python_requires='>=3.6',
setup_requires=setup_requires,
test_suite='tests',
tests_require=tests_require,
url='https://github.com/D3-AI/Orion',
version='0.1.0-dev',
version='0.1.0.dev0',
zip_safe=False,
)

0 comments on commit 509a39f

Please sign in to comment.