Skip to content

Commit e9ff1b3

Browse files
committed
make release-tag: Merge branch 'master' into stable
2 parents 6ce5f9b + 282b248 commit e9ff1b3

File tree

14 files changed

+331
-85
lines changed

14 files changed

+331
-85
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: Bug report
3+
about: Report an error that you found when using DeepEcho
4+
title: ''
5+
labels: bug, pending review
6+
assignees: ''
7+
8+
---
9+
10+
### Environment Details
11+
12+
Please indicate the following details about the environment in which you found the bug:
13+
14+
* DeepEcho version:
15+
* Python version:
16+
* Operating System:
17+
18+
### Error Description
19+
20+
<!--Replace this text with a description of what you were trying to get done.
21+
Tell us what happened, what went wrong, and what you expected to happen.-->
22+
23+
### Steps to reproduce
24+
25+
<!--Replace this text with a description of the steps that anyone can follow to
26+
reproduce the error. If the error happens only on a specific dataset, please
27+
consider attaching some example data to the issue so that others can use it
28+
to reproduce the error.-->
29+
30+
```
31+
Paste the command(s) you ran and the output.
32+
If there was a crash, please include the traceback here.
33+
```
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: Feature request
3+
about: Request a new feature that you would like to see implemented in DeepEcho
4+
title: ''
5+
labels: new feature, pending review
6+
assignees: ''
7+
8+
---
9+
10+
### Problem Description
11+
12+
<!--Replace this with a description of the problem that you think DeepEcho should be able
13+
to solve and is not solving already-->
14+
15+
### Expected behavior
16+
17+
<!--Replace this a clear and concise description of what you would expect DeepEcho with regards
18+
with the described problem. If possible, explain how you would like to interact with DeepEcho
19+
and what the outcome of this interaction would be.-->
20+
21+
### Additional context
22+
23+
<!--Please provide any additional context that may be relevant to the issue here. If none,
24+
please remove this section.-->

.github/ISSUE_TEMPLATE/question.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: Question
3+
about: Doubts about DeepEcho usage
4+
title: ''
5+
labels: question, pending review
6+
assignees: ''
7+
8+
---
9+
10+
### Environment details
11+
12+
If you are already running DeepEcho, please indicate the following details about the environment in
13+
which you are running it:
14+
15+
* DeepEcho version:
16+
* Python version:
17+
* Operating System:
18+
19+
### Problem description
20+
21+
<!--Replace this with a description of the problem that you are trying to solve using DeepEcho. If
22+
possible, describe the data that you are using, or consider attaching some example data
23+
that others can use to propose a working solution for your problem.-->
24+
25+
### What I already tried
26+
27+
<!--Replace with a description of what you already tried and what is the behavior that you observe.
28+
If possible, also add below the exact code that you are running.-->
29+
30+
```
31+
Paste the command(s) you ran and the output.
32+
If there was a crash, please include the traceback here.
33+
```

.github/workflows/tests.yml

Lines changed: 92 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,107 @@ on:
77
branches: [ master ]
88

99
jobs:
10-
build:
11-
runs-on: ubuntu-latest
10+
lint:
11+
runs-on: ${{ matrix.os }}
12+
strategy:
13+
matrix:
14+
python-version: [3.8]
15+
os: [ubuntu-latest, macos-latest, windows-latest]
16+
steps:
17+
- uses: actions/checkout@v1
18+
- name: Set up Python ${{ matrix.python-version }}
19+
uses: actions/setup-python@v1
20+
with:
21+
python-version: ${{ matrix.python-version }}
22+
- if: matrix.os == 'windows-latest'
23+
name: Install dependencies - Windows
24+
run: pip install 'torch>=1,<2' -f https://download.pytorch.org/whl/torch_stable.html
25+
- name: Install package
26+
run: pip install invoke .[dev]
27+
- name: invoke lint
28+
run: invoke lint
29+
30+
readme:
31+
runs-on: ${{ matrix.os }}
1232
strategy:
1333
matrix:
1434
python-version: [3.6, 3.7, 3.8]
35+
os: [ubuntu-latest, macos-latest]
36+
steps:
37+
- uses: actions/checkout@v1
38+
- name: Set up Python ${{ matrix.python-version }}
39+
uses: actions/setup-python@v1
40+
with:
41+
python-version: ${{ matrix.python-version }}
42+
- name: Install package and dependencies
43+
run: pip install invoke rundoc .
44+
- name: invoke readme
45+
run: invoke readme
1546

47+
unit:
48+
runs-on: ${{ matrix.os }}
49+
strategy:
50+
matrix:
51+
python-version: [3.6, 3.7, 3.8]
52+
os: [ubuntu-latest, macos-latest, windows-latest]
1653
steps:
1754
- uses: actions/checkout@v1
1855
- name: Set up Python ${{ matrix.python-version }}
1956
uses: actions/setup-python@v1
2057
with:
2158
python-version: ${{ matrix.python-version }}
59+
- if: matrix.os == 'windows-latest'
60+
name: Install dependencies - Windows
61+
run: pip install 'torch>=1,<2' -f https://download.pytorch.org/whl/torch_stable.html
62+
- name: Install package and dependencies
63+
run: pip install invoke .[test]
64+
- name: invoke pytest
65+
run: invoke pytest
2266

23-
- name: Install dependencies
24-
run: |
25-
sudo apt-get install pandoc
26-
python -m pip install --upgrade pip
27-
pip install tox tox-gh-actions
67+
minimum:
68+
runs-on: ${{ matrix.os }}
69+
strategy:
70+
matrix:
71+
python-version: [3.6, 3.7, 3.8]
72+
os: [ubuntu-latest, macos-latest, windows-latest]
73+
steps:
74+
- uses: actions/checkout@v1
75+
- name: Set up Python ${{ matrix.python-version }}
76+
uses: actions/setup-python@v1
77+
with:
78+
python-version: ${{ matrix.python-version }}
79+
- if: matrix.os == 'windows-latest'
80+
name: Install dependencies - Windows
81+
run: pip install 'torch==1.4' -f https://download.pytorch.org/whl/torch_stable.html
82+
- name: Install package and dependencies
83+
run: pip install invoke .[test]
84+
- name: invoke minimum
85+
run: invoke minimum
2886

29-
- name: Test with tox
30-
run: tox
87+
tutorials:
88+
runs-on: ${{ matrix.os }}
89+
strategy:
90+
matrix:
91+
python-version: [3.6, 3.7, 3.8]
92+
os: [ubuntu-latest]
93+
steps:
94+
- uses: actions/checkout@v1
95+
- name: Set up Python ${{ matrix.python-version }}
96+
uses: actions/setup-python@v1
97+
with:
98+
python-version: ${{ matrix.python-version }}
99+
- if: matrix.os == 'ubuntu-latest'
100+
name: Install dependencies - Ubuntu
101+
run: sudo apt-get install graphviz
102+
- if: matrix.os == 'macos-latest'
103+
name: Install dependencies - MacOS
104+
run: brew install graphviz
105+
- if: matrix.os == 'windows-latest'
106+
name: Install dependencies - Windows
107+
run: |
108+
pip install 'torch>=1,<2' -f https://download.pytorch.org/whl/torch_stable.html
109+
choco install graphviz
110+
- name: Install package and dependencies
111+
run: pip install invoke jupyter .
112+
- name: invoke tutorials
113+
run: invoke tutorials

.travis.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

HISTORY.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# History
22

3+
## 0.2.0 - 2021-02-24
4+
5+
Maintenance release to update dependencies and ensure compatibility with the rest
6+
of the SDV ecosystem libraries.
7+
38
## 0.1.4 - 2020-10-16
49

510
Minor maintenance version to update dependencies and documentation, and

Makefile

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ lint-tests: ## check style with flake8 and isort
9797
isort -c --recursive tests
9898

9999
.PHONY: lint
100-
lint:lint-deepecho lint-tests ## Run all code style checks
100+
lint: ## Run all code style checks
101+
invoke lint
101102

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

109110
# TEST TARGETS
110111

111-
.PHONY: test-unit
112-
test-unit: ## run tests quickly with the default Python
113-
python -m pytest --cov=deepecho
112+
.PHONY: test-pytest
113+
test-pytest: ## run all the tests using pytest
114+
invoke pytest
114115

115116
.PHONY: test-readme
116117
test-readme: ## run the readme snippets
117-
rm -rf tests/readme_test && mkdir tests/readme_test
118-
cd tests/readme_test && rundoc run --single-session python3 -t python3 ../../README.md
119-
rm -rf tests/readme_test
118+
invoke readme
120119

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

125124
.PHONY: check-dependencies
126125
check-dependencies: ## test if there are any broken dependencies
127126
pip check
128127

129128
.PHONY: test
130-
test: test-unit test-readme ## test everything that needs test dependencies
129+
test: test-pytest test-readme test-tutorials ## test everything that needs test dependencies
131130

132131
.PHONY: test-devel
133-
test-devel: check-dependencies lint docs ## test everything that needs development dependencies
132+
test-devel: lint docs ## test everything that needs development dependencies
134133

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

conda/meta.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% set name = "deepecho" %}
2-
{% set version = "version = '0.1.4'" %}
2+
{% set version = "version = '0.2.0.dev1'" %}
33

44
package:
55
name: "{{ name|lower }}"
@@ -15,29 +15,29 @@ build:
1515

1616
requirements:
1717
host:
18-
- numpy >=1.15.4,<2
19-
- pandas >=0.22,<1.1.5
2018
- pip
21-
- python
22-
- pytorch >=1,<2
23-
- tqdm >=4,<5
2419
- pytest-runner
20+
- python >=3.6,<3.9
21+
- numpy >=1.18.0,<2
22+
- pandas >=1.1,<1.1.5
23+
- pytorch >=1.4,<2
24+
- tqdm >=4.10,<5
2525
run:
26-
- numpy >=1.15.4,<2
27-
- pandas >=0.22,<1.1.5
28-
- python
29-
- pytorch >=1,<2
30-
- tqdm >=4,<5
26+
- python >=3.6,<3.9
27+
- numpy >=1.18.0,<2
28+
- pandas >=1.1,<1.1.5
29+
- pytorch >=1.4,<2
30+
- tqdm >=4.10,<5
3131

3232
about:
3333
home: "https://github.com/sdv-dev/DeepEcho"
3434
license: MIT
3535
license_family: MIT
36-
license_file:
36+
license_file:
3737
summary: "Mixed-type multivariate time series modeling with generative adversarial networks."
38-
doc_url:
39-
dev_url:
38+
doc_url:
39+
dev_url:
4040

4141
extra:
4242
recipe-maintainers:
43-
- sdv-dev
43+
- sdv-dev

deepecho/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
__author__ = 'MIT Data To AI Lab'
44
__email__ = '[email protected]'
5-
__version__ = '0.1.4'
5+
__version__ = '0.2.0.dev1'
66
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
77

88
from deepecho.demo import load_demo

0 commit comments

Comments
 (0)