Skip to content

Commit f5679f3

Browse files
committed
make release-tag: Merge branch 'master' into stable
2 parents 1fd2a6d + 89cecf7 commit f5679f3

File tree

114 files changed

+3765
-4317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+3765
-4317
lines changed

.github/workflows/tests.yml

Lines changed: 69 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,87 @@ on:
77
branches: [ master ]
88

99
jobs:
10-
build:
10+
lint:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
python-version: [3.5, 3.6, 3.7]
15-
os: [ubuntu-latest]
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
1629

30+
readme:
31+
runs-on: ${{ matrix.os }}
32+
strategy:
33+
matrix:
34+
python-version: [3.6, 3.7, 3.8]
35+
os: [ubuntu-latest, macos-latest]
1736
steps:
1837
- uses: actions/checkout@v1
1938
- name: Set up Python ${{ matrix.python-version }}
2039
uses: actions/setup-python@v1
2140
with:
2241
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
2346

24-
- name: Install dependencies
25-
run: |
26-
python -m pip install --upgrade pip
27-
pip install tox tox-gh-actions
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]
53+
steps:
54+
- uses: actions/checkout@v1
55+
- name: Set up Python ${{ matrix.python-version }}
56+
uses: actions/setup-python@v1
57+
with:
58+
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
2866

67+
tutorials:
68+
runs-on: ${{ matrix.os }}
69+
strategy:
70+
matrix:
71+
python-version: [3.6, 3.7, 3.8]
72+
os: [ubuntu-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 }}
2979
- if: matrix.os == 'ubuntu-latest'
30-
name: Install pandoc - Ubuntu
31-
run: |
32-
sudo apt install pandoc
33-
80+
name: Install dependencies - Ubuntu
81+
run: sudo apt-get install graphviz
3482
- if: matrix.os == 'macos-latest'
35-
name: Install pandoc - MacOS
83+
name: Install dependencies - MacOS
84+
run: brew install graphviz
85+
- if: matrix.os == 'windows-latest'
86+
name: Install dependencies - Windows
3687
run: |
37-
brew install pandoc
38-
39-
- name: Test with tox
40-
run: tox
88+
pip install 'torch>=1,<2' -f https://download.pytorch.org/whl/torch_stable.html
89+
choco install graphviz
90+
- name: Install package and dependencies
91+
run: pip install invoke jupyter .[ctgan]
92+
- name: invoke tutorials
93+
run: invoke tutorials

.travis.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
# Config file for automatic testing at travis-ci.org
2+
os: linux
23
dist: bionic
34
language: python
45
python:
5-
- 3.8
6-
- 3.7
76
- 3.6
8-
- 3.5
7+
- 3.7
8+
- 3.8
9+
env:
10+
- TOXENV=lint
11+
- TOXENV=readme
12+
- TOXENV=pytest
13+
- TOXENV=tutorials
914

1015
# Command to install dependencies
11-
addons:
12-
apt:
13-
packages:
14-
- pandoc
15-
install: pip install -U tox-travis codecov
16+
install:
17+
- sudo apt-get update
18+
- pip install -U tox-travis codecov
1619

1720
after_success: codecov
1821

19-
# Command to run tests
20-
script: tox
22+
script: travis_wait 60 tox

HISTORY.md

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

3+
## v0.1.0 - 2020-12-18
4+
5+
This release introduces a new project organization and API, with metrics
6+
grouped by data modality, with a common API:
7+
8+
* Single Column
9+
* Column Pair
10+
* Single Table
11+
* Multi Table
12+
* Time Series
13+
14+
Within each data modality, different families of metrics have been implemented:
15+
16+
* Statistical
17+
* Detection
18+
* Bayesian Network and Gaussian Mixture Likelihood
19+
* Machine Learning Efficacy
20+
21+
## v0.0.4 - 2020-11-27
22+
23+
Patch release to relax dependencies and avoid conflicts when using the latest SDV version.
24+
25+
## v0.0.3 - 2020-11-20
26+
27+
Fix error on detection metrics when input data contains infinity or NaN values.
28+
29+
### Issues closed
30+
31+
* ValueError: Input contains infinity or a value too large for dtype('float64') - Issue [#11](https://github.com/sdv-dev/SDMetrics/issues/11) by @csala
32+
333
## v0.0.2 - 2020-08-08
434

535
Add support for Python 3.8 and a broader range of dependencies.

INSTALL.md

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# Installing SDMetrics
2+
3+
## Requirements
4+
5+
**SDMetrics** has been developed and tested on [Python 3.6, 3.7 and 3.8](https://www.python.org/downloads/)
6+
7+
Also, although it is not strictly required, the usage of a [virtualenv](
8+
https://virtualenv.pypa.io/en/latest/) is highly recommended in order to avoid
9+
interfering with other software installed in the system where **SDMetrics** is run.
10+
11+
## Install with pip
12+
13+
The easiest and recommended way to install **SDMetrics** is using [pip](
14+
https://pip.pypa.io/en/stable/):
15+
16+
```bash
17+
pip install sdmetrics
18+
```
19+
20+
This will pull and install the latest stable release from [PyPi](https://pypi.org/).
21+
22+
## Install with conda
23+
24+
**SDMetrics** can also be installed using [conda](https://docs.conda.io/en/latest/):
25+
26+
```bash
27+
conda install -c sdv-dev -c conda-forge sdmetrics
28+
```
29+
30+
This will pull and install the latest stable release from [Anaconda](https://anaconda.org/).
31+
32+
## Install from source
33+
34+
If you want to install **SDMetrics** from source you need to first clone the repository
35+
and then execute the `make install` command inside the `stable` branch. Note that this
36+
command works only on Unix based systems like GNU/Linux and macOS:
37+
38+
```bash
39+
git clone https://github.com/sdv-dev/SDMetrics
40+
cd SDMetrics
41+
git checkout stable
42+
make install
43+
```
44+
45+
## Install for development
46+
47+
If you intend to modify the source code or contribute to the project you will need to
48+
install it from the source using the `make install-develop` command. In this case, we
49+
recommend you to branch from `master` first:
50+
51+
```bash
52+
git clone git@github.com:sdv-dev/SDMetrics
53+
cd SDMetrics
54+
git checkout master
55+
git checkout -b <your-branch-name>
56+
make install-develp
57+
```
58+
59+
For more details about how to contribute to the project please visit the [Contributing Guide](
60+
CONTRIBUTING.rst).

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include CONTRIBUTING.rst
33
include HISTORY.md
44
include LICENSE
55
include README.md
6+
include sdmetrics/demos/*.pkl
67

78
recursive-include tests *
89
recursive-exclude * __pycache__

Makefile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ install-develop: clean-build clean-pyc ## install the package in editable mode a
8787

8888
.PHONY: lint
8989
lint: ## check style with flake8 and isort
90-
flake8 sdmetrics tests
91-
isort -c --recursive sdmetrics tests
90+
invoke lint
9291

9392
.PHONY: fix-lint
9493
fix-lint: ## fix lint issues using autoflake, autopep8, and isort
@@ -101,17 +100,15 @@ fix-lint: ## fix lint issues using autoflake, autopep8, and isort
101100

102101
.PHONY: test-unit
103102
test-unit: ## run tests quickly with the default Python
104-
python -m pytest --cov=sdmetrics
103+
invoke pytest
105104

106105
.PHONY: test-readme
107106
test-readme: ## run the readme snippets
108-
rm -rf tests/readme_test && mkdir tests/readme_test
109-
cd tests/readme_test && rundoc run --single-session python3 -t python3 ../../README.md
110-
rm -rf tests/readme_test
107+
invoke readme
111108

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

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

0 commit comments

Comments
 (0)