Skip to content

Commit ad9b6a3

Browse files
amontanez24amontanez24
committed
make release-tag: Merge branch 'master' into stable
2 parents ded6241 + 7145cc6 commit ad9b6a3

27 files changed

+312
-248
lines changed

‎.github/workflows/integration.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,34 @@
11
name: Integration Tests
22

33
on:
4-
- push
5-
- pull_request
4+
push:
5+
pull_request:
6+
types: [opened, reopened]
67

78
jobs:
8-
unit:
9+
integration:
910
runs-on: ${{ matrix.os }}
1011
strategy:
1112
matrix:
12-
python-version: [3.6, 3.7, 3.8]
13-
os: [ubuntu-latest, macos-10.15, windows-latest]
13+
python-version: ['3.7', '3.8', '3.9', '3.10']
14+
os: [ubuntu-latest, macos-latest, windows-latest]
1415
steps:
1516
- uses: actions/checkout@v1
1617
- name: Set up Python ${{ matrix.python-version }}
17-
uses: actions/setup-python@v1
18+
uses: actions/setup-python@v2
1819
with:
1920
python-version: ${{ matrix.python-version }}
2021
- if: matrix.os == 'windows-latest'
2122
name: Install dependencies - Windows
2223
run: |
2324
python -m pip install --upgrade pip
24-
python -m pip install 'torch>=1.4,<2' -f https://download.pytorch.org/whl/cpu/torch/
25+
python -m pip install 'torch>=1.8,<2' -f https://download.pytorch.org/whl/cpu/torch/
2526
- name: Install dependencies
2627
run: |
2728
python -m pip install --upgrade pip
2829
python -m pip install invoke .[test]
2930
- name: Run integration tests
3031
run: invoke integration
32+
- if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.8
33+
name: Upload codecov report
34+
uses: codecov/codecov-action@v2

‎.github/workflows/lint.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
name: Style Checks
22

33
on:
4-
- push
5-
- pull_request
4+
push:
5+
pull_request:
6+
types: [opened, reopened]
67

78
jobs:
89
lint:
910
runs-on: ubuntu-latest
1011
steps:
1112
- uses: actions/checkout@v1
1213
- name: Set up Python 3.8
13-
uses: actions/setup-python@v1
14+
uses: actions/setup-python@v2
1415
with:
1516
python-version: 3.8
1617
- name: Install dependencies

‎.github/workflows/minimum.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
11
name: Unit Tests Minimum Versions
22

33
on:
4-
- push
5-
- pull_request
4+
push:
5+
pull_request:
6+
types: [opened, reopened]
67

78
jobs:
89
minimum:
910
runs-on: ${{ matrix.os }}
1011
strategy:
1112
matrix:
12-
python-version: [3.6, 3.7, 3.8]
13-
os: [ubuntu-latest, macos-10.15, windows-latest]
13+
python-version: ['3.7', '3.8', '3.9', '3.10']
14+
os: [ubuntu-latest, macos-latest, windows-latest]
1415
steps:
1516
- uses: actions/checkout@v1
1617
- name: Set up Python ${{ matrix.python-version }}
17-
uses: actions/setup-python@v1
18+
uses: actions/setup-python@v2
1819
with:
1920
python-version: ${{ matrix.python-version }}
20-
- if: matrix.os == 'windows-latest'
21+
- if: matrix.os == 'windows-latest' && matrix.python-version != 3.10
2122
name: Install dependencies - Windows
2223
run: |
2324
python -m pip install --upgrade pip
24-
python -m pip install 'torch==1.4' -f https://download.pytorch.org/whl/cpu/torch/
25+
python -m pip install 'torch==1.8' -f https://download.pytorch.org/whl/cpu/torch/
26+
- if: matrix.os == 'windows-latest' && matrix.python-version == 3.10
27+
name: Install dependencies - Windows
28+
run: |
29+
python -m pip install --upgrade pip
30+
python -m pip install 'torch==1.11.0' -f https://download.pytorch.org/whl/cpu/torch/
2531
- name: Install dependencies
2632
run: |
2733
python -m pip install --upgrade pip

‎.github/workflows/readme.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
name: Test README
22

33
on:
4-
- push
5-
- pull_request
4+
push:
5+
pull_request:
6+
types: [opened, reopened]
67

78
jobs:
89
readme:
910
runs-on: ${{ matrix.os }}
1011
strategy:
1112
matrix:
12-
python-version: [3.6, 3.7, 3.8]
13-
os: [ubuntu-latest, macos-10.15] # skip windows bc rundoc fails
13+
python-version: ['3.7', '3.8', '3.9', '3.10']
14+
os: [ubuntu-latest, macos-latest] # skip windows bc rundoc fails
1415
steps:
1516
- uses: actions/checkout@v1
1617
- name: Set up Python ${{ matrix.python-version }}
17-
uses: actions/setup-python@v1
18+
uses: actions/setup-python@v2
1819
with:
1920
python-version: ${{ matrix.python-version }}
2021
- name: Install dependencies

‎.github/workflows/unit.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
11
name: Unit Tests
22

33
on:
4-
- push
5-
- pull_request
4+
push:
5+
pull_request:
6+
types: [opened, reopened]
67

78
jobs:
89
unit:
910
runs-on: ${{ matrix.os }}
1011
strategy:
1112
matrix:
12-
python-version: [3.6, 3.7, 3.8]
13-
os: [ubuntu-latest, macos-10.15, windows-latest]
13+
python-version: ['3.7', '3.8', '3.9', '3.10']
14+
os: [ubuntu-latest, macos-latest, windows-latest]
1415
steps:
1516
- uses: actions/checkout@v1
1617
- name: Set up Python ${{ matrix.python-version }}
17-
uses: actions/setup-python@v1
18+
uses: actions/setup-python@v2
1819
with:
1920
python-version: ${{ matrix.python-version }}
2021
- if: matrix.os == 'windows-latest'
2122
name: Install dependencies - Windows
2223
run: |
2324
python -m pip install --upgrade pip
24-
python -m pip install 'torch>=1.4,<2' -f https://download.pytorch.org/whl/cpu/torch/
25+
python -m pip install 'torch>=1.8,<2' -f https://download.pytorch.org/whl/cpu/torch/
2526
- name: Install dependencies
2627
run: |
2728
python -m pip install --upgrade pip
2829
python -m pip install invoke .[test]
2930
- name: Run unit tests
3031
run: invoke unit
31-
- if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.8
32-
name: Upload codecov report
33-
run: invoke coverage
34-
uses: codecov/codecov-action@v2

‎AUTHORS.rst

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
=======
2-
Credits
3-
=======
4-
5-
* Kevin Alex Zhang <[email protected]>
6-
* Kalyan Veeramachaneni <[email protected]>
7-
* Carles Sala <[email protected]>
1+
See: https://github.com/sdv-dev/DeepEcho/graphs/contributors

‎HISTORY.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
This release adds support for Python 3.9 and updates dependencies to ensure compatibility with the rest
66
of the SDV ecosystem.
77

8-
* Add support for Python 3.9 - Issue[41](https://github.com/sdv-dev/DeepEcho/issues/41) by @fealho
9-
* Add pip check to CI workflows internal improvements - Issue[39](https://github.com/sdv-dev/DeepEcho/issues/39) by @pvk-developer
10-
* Add support for pylint>2.7.2 housekeeping - Issue[33](https://github.com/sdv-dev/DeepEcho/issues/33) by @fealho
11-
* Add support for torch>=1.8 housekeeping - Issue[32](https://github.com/sdv-dev/DeepEcho/issues/32) by @fealho
8+
* Add support for Python 3.9 - Issue [#41](https://github.com/sdv-dev/DeepEcho/issues/41) by @fealho
9+
* Add pip check to CI workflows internal improvements - Issue [#39](https://github.com/sdv-dev/DeepEcho/issues/39) by @pvk-developer
10+
* Add support for pylint>2.7.2 housekeeping - Issue [#33](https://github.com/sdv-dev/DeepEcho/issues/33) by @fealho
11+
* Add support for torch>=1.8 housekeeping - Issue [#32](https://github.com/sdv-dev/DeepEcho/issues/32) by @fealho
1212

1313
## 0.2.1 - 2021-10-12
1414

‎INSTALL.md

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

33
## Requirements
44

5-
**DeepEcho** has been developed and tested on [Python 3.6, 3.7, 3.8 and 3.9](https://www.python.org/downloads/)
5+
**DeepEcho** has been developed and tested on
6+
[Python 3.7, 3.8, 3.9, 3.10 and 3.11](https://www.python.org/downloads/)
67

78
Also, although it is not strictly required, the usage of a [virtualenv](
89
https://virtualenv.pypa.io/en/latest/) is highly recommended in order to avoid

‎LICENSE

Lines changed: 102 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,107 @@
1-
MIT License
1+
Business Source License 1.1
22

3-
Copyright (c) 2020, MIT Data To AI Lab
3+
Parameters
44

5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
5+
Licensor: DataCebo, Inc.
116

12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
7+
Licensed Work: DeepEcho
8+
The Licensed Work is (c) DataCebo, Inc.
149

15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
10+
Additional Use Grant: You may make use of the Licensed Work, and derivatives of the Licensed
11+
Work, provided that you do not use the Licensed Work, or derivatives of
12+
the Licensed Work, for a Synthetic Data Creation Service.
2213

14+
A "Synthetic Data Creation Service" is a commercial offering
15+
that allows third parties (other than your employees and
16+
contractors) to access the functionality of the Licensed
17+
Work so that such third parties directly benefit from the
18+
data processing, machine learning or synthetic data creation
19+
features of the Licensed Work.
20+
21+
Change Date: Change date is four years from release date.
22+
Please see https://github.com/sdv-dev/DeepEcho/releases
23+
for exact dates.
24+
25+
Change License: MIT License
26+
27+
28+
29+
Notice
30+
31+
The Business Source License (this document, or the "License") is not an Open
32+
Source license. However, the Licensed Work will eventually be made available
33+
under an Open Source License, as stated in this License.
34+
35+
License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
36+
"Business Source License" is a trademark of MariaDB Corporation Ab.
37+
38+
-----------------------------------------------------------------------------
39+
40+
Business Source License 1.1
41+
42+
Terms
43+
44+
The Licensor hereby grants you the right to copy, modify, create derivative
45+
works, redistribute, and make non-production use of the Licensed Work. The
46+
Licensor may make an Additional Use Grant, above, permitting limited
47+
production use.
48+
49+
Effective on the Change Date, or the fourth anniversary of the first publicly
50+
available distribution of a specific version of the Licensed Work under this
51+
License, whichever comes first, the Licensor hereby grants you rights under
52+
the terms of the Change License, and the rights granted in the paragraph
53+
above terminate.
54+
55+
If your use of the Licensed Work does not comply with the requirements
56+
currently in effect as described in this License, you must purchase a
57+
commercial license from the Licensor, its affiliated entities, or authorized
58+
resellers, or you must refrain from using the Licensed Work.
59+
60+
All copies of the original and modified Licensed Work, and derivative works
61+
of the Licensed Work, are subject to this License. This License applies
62+
separately for each version of the Licensed Work and the Change Date may vary
63+
for each version of the Licensed Work released by Licensor.
64+
65+
You must conspicuously display this License on each original or modified copy
66+
of the Licensed Work. If you receive the Licensed Work in original or
67+
modified form from a third party, the terms and conditions set forth in this
68+
License apply to your use of that work.
69+
70+
Any use of the Licensed Work in violation of this License will automatically
71+
terminate your rights under this License for the current and all other
72+
versions of the Licensed Work.
73+
74+
This License does not grant you any right in any trademark or logo of
75+
Licensor or its affiliates (provided that you may use a trademark or logo of
76+
Licensor as expressly required by this License).
77+
78+
TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
79+
AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
80+
EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
81+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
82+
TITLE.
83+
84+
MariaDB hereby grants you permission to use this License’s text to license
85+
your works, and to refer to it using the trademark "Business Source License",
86+
as long as you comply with the Covenants of Licensor below.
87+
88+
Covenants of Licensor
89+
90+
In consideration of the right to use this License’s text and the "Business
91+
Source License" name and trademark, Licensor covenants to MariaDB, and to all
92+
other recipients of the licensed work to be provided by Licensor:
93+
94+
1. To specify as the Change License the GPL Version 2.0 or any later version,
95+
or a license that is compatible with GPL Version 2.0 or a later version,
96+
where "compatible" means that software provided under the Change License can
97+
be included in a program with software provided under GPL Version 2.0 or a
98+
later version. Licensor may specify additional Change Licenses without
99+
limitation.
100+
101+
2. To either: (a) specify an additional grant of rights to use that does not
102+
impose any additional restriction on the right granted in this License, as
103+
the Additional Use Grant; or (b) insert the text "None".
104+
105+
3. To specify a Change Date.
106+
107+
4. Not to modify this License in any other way.

0 commit comments

Comments
 (0)