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 Feb 24, 2021
2 parents 6ce5f9b + 282b248 commit e9ff1b3
Show file tree
Hide file tree
Showing 14 changed files with 331 additions and 85 deletions.
15 changes: 0 additions & 15 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
name: Bug report
about: Report an error that you found when using DeepEcho
title: ''
labels: bug, pending review
assignees: ''

---

### Environment Details

Please indicate the following details about the environment in which you found the bug:

* DeepEcho version:
* Python version:
* Operating System:

### Error Description

<!--Replace this text with a description of what you were trying to get done.
Tell us what happened, what went wrong, and what you expected to happen.-->

### Steps to reproduce

<!--Replace this text with a description of the steps that anyone can follow to
reproduce the error. If the error happens only on a specific dataset, please
consider attaching some example data to the issue so that others can use it
to reproduce the error.-->

```
Paste the command(s) you ran and the output.
If there was a crash, please include the traceback here.
```
24 changes: 24 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
name: Feature request
about: Request a new feature that you would like to see implemented in DeepEcho
title: ''
labels: new feature, pending review
assignees: ''

---

### Problem Description

<!--Replace this with a description of the problem that you think DeepEcho should be able
to solve and is not solving already-->

### Expected behavior

<!--Replace this a clear and concise description of what you would expect DeepEcho with regards
with the described problem. If possible, explain how you would like to interact with DeepEcho
and what the outcome of this interaction would be.-->

### Additional context

<!--Please provide any additional context that may be relevant to the issue here. If none,
please remove this section.-->
33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
name: Question
about: Doubts about DeepEcho usage
title: ''
labels: question, pending review
assignees: ''

---

### Environment details

If you are already running DeepEcho, please indicate the following details about the environment in
which you are running it:

* DeepEcho version:
* Python version:
* Operating System:

### Problem description

<!--Replace this with a description of the problem that you are trying to solve using DeepEcho. If
possible, describe the data that you are using, or consider attaching some example data
that others can use to propose a working solution for your problem.-->

### What I already tried

<!--Replace with a description of what you already tried and what is the behavior that you observe.
If possible, also add below the exact code that you are running.-->

```
Paste the command(s) you ran and the output.
If there was a crash, please include the traceback here.
```
101 changes: 92 additions & 9 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,107 @@ on:
branches: [ master ]

jobs:
build:
runs-on: ubuntu-latest
lint:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.8]
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- if: matrix.os == 'windows-latest'
name: Install dependencies - Windows
run: pip install 'torch>=1,<2' -f https://download.pytorch.org/whl/torch_stable.html
- name: Install package
run: pip install invoke .[dev]
- name: invoke lint
run: invoke lint

readme:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
os: [ubuntu-latest, macos-latest]
steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Install package and dependencies
run: pip install invoke rundoc .
- name: invoke readme
run: invoke readme

unit:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- if: matrix.os == 'windows-latest'
name: Install dependencies - Windows
run: pip install 'torch>=1,<2' -f https://download.pytorch.org/whl/torch_stable.html
- name: Install package and dependencies
run: pip install invoke .[test]
- name: invoke pytest
run: invoke pytest

- name: Install dependencies
run: |
sudo apt-get install pandoc
python -m pip install --upgrade pip
pip install tox tox-gh-actions
minimum:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- if: matrix.os == 'windows-latest'
name: Install dependencies - Windows
run: pip install 'torch==1.4' -f https://download.pytorch.org/whl/torch_stable.html
- name: Install package and dependencies
run: pip install invoke .[test]
- name: invoke minimum
run: invoke minimum

- name: Test with tox
run: tox
tutorials:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- if: matrix.os == 'ubuntu-latest'
name: Install dependencies - Ubuntu
run: sudo apt-get install graphviz
- if: matrix.os == 'macos-latest'
name: Install dependencies - MacOS
run: brew install graphviz
- if: matrix.os == 'windows-latest'
name: Install dependencies - Windows
run: |
pip install 'torch>=1,<2' -f https://download.pytorch.org/whl/torch_stable.html
choco install graphviz
- name: Install package and dependencies
run: pip install invoke jupyter .
- name: invoke tutorials
run: invoke tutorials
18 changes: 0 additions & 18 deletions .travis.yml

This file was deleted.

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

## 0.2.0 - 2021-02-24

Maintenance release to update dependencies and ensure compatibility with the rest
of the SDV ecosystem libraries.

## 0.1.4 - 2020-10-16

Minor maintenance version to update dependencies and documentation, and
Expand Down
19 changes: 9 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ lint-tests: ## check style with flake8 and isort
isort -c --recursive tests

.PHONY: lint
lint:lint-deepecho lint-tests ## Run all code style checks
lint: ## Run all code style checks
invoke lint

.PHONY: fix-lint
fix-lint: ## fix lint issues using autoflake, autopep8, and isort
Expand All @@ -108,29 +109,27 @@ fix-lint: ## fix lint issues using autoflake, autopep8, and isort

# TEST TARGETS

.PHONY: test-unit
test-unit: ## run tests quickly with the default Python
python -m pytest --cov=deepecho
.PHONY: test-pytest
test-pytest: ## run all the tests using pytest
invoke pytest

.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
invoke readme

.PHONY: test-tutorials
test-tutorials: ## run the tutorial notebooks
jupyter nbconvert --execute --ExecutePreprocessor.timeout=600 tutorials/*.ipynb --stdout > /dev/null
invoke tutorials

.PHONY: check-dependencies
check-dependencies: ## test if there are any broken dependencies
pip check

.PHONY: test
test: test-unit test-readme ## test everything that needs test dependencies
test: test-pytest test-readme test-tutorials ## test everything that needs test dependencies

.PHONY: test-devel
test-devel: check-dependencies lint docs ## test everything that needs development dependencies
test-devel: lint docs ## test everything that needs development dependencies

.PHONY: test-all
test-all: ## run tests on every Python version with tox
Expand Down
30 changes: 15 additions & 15 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "deepecho" %}
{% set version = "version = '0.1.4'" %}
{% set version = "version = '0.2.0.dev1'" %}

package:
name: "{{ name|lower }}"
Expand All @@ -15,29 +15,29 @@ build:

requirements:
host:
- numpy >=1.15.4,<2
- pandas >=0.22,<1.1.5
- pip
- python
- pytorch >=1,<2
- tqdm >=4,<5
- pytest-runner
- python >=3.6,<3.9
- numpy >=1.18.0,<2
- pandas >=1.1,<1.1.5
- pytorch >=1.4,<2
- tqdm >=4.10,<5
run:
- numpy >=1.15.4,<2
- pandas >=0.22,<1.1.5
- python
- pytorch >=1,<2
- tqdm >=4,<5
- python >=3.6,<3.9
- numpy >=1.18.0,<2
- pandas >=1.1,<1.1.5
- pytorch >=1.4,<2
- tqdm >=4.10,<5

about:
home: "https://github.com/sdv-dev/DeepEcho"
license: MIT
license_family: MIT
license_file:
license_file:
summary: "Mixed-type multivariate time series modeling with generative adversarial networks."
doc_url:
dev_url:
doc_url:
dev_url:

extra:
recipe-maintainers:
- sdv-dev
- sdv-dev
2 changes: 1 addition & 1 deletion deepecho/__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__ = '[email protected]'
__version__ = '0.1.4'
__version__ = '0.2.0.dev1'
__path__ = __import__('pkgutil').extend_path(__path__, __name__)

from deepecho.demo import load_demo
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.1.4
current_version = 0.2.0.dev1
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<candidate>\d+))?
Expand Down
Loading

0 comments on commit e9ff1b3

Please sign in to comment.