Skip to content

Commit 361a774

Browse files
j-groverj-grover
authored
Merge branch 'master' into variable-types-#10 
2 parents 72f6691 + 047f91c commit 361a774

File tree

16 files changed

+148
-106
lines changed

16 files changed

+148
-106
lines changed

‎.DS_Store‎

-12 KB
Binary file not shown.

‎.circleci/config.yml‎

Lines changed: 105 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,120 @@
11
version: 2.1
22

3-
commands:
4-
install-packaged-autonormalize:
5-
description: "install autonormalize from source distribution"
6-
steps:
7-
- run : |
8-
source test_env/bin/activate
9-
python setup.py sdist
10-
AUTONORMALIZE_VERSION=$(python setup.py --version)
11-
tar -zxvf "dist/autonormalize-${AUTONORMALIZE_VERSION}.tar.gz"
12-
pip install -e "autonormalize-${AUTONORMALIZE_VERSION}/"
13-
pip install -r "autonormalize-${AUTONORMALIZE_VERSION}/test-requirements.txt"
14-
run-packaged-tests:
15-
description: "run unit tests on packaged testing files"
16-
steps:
17-
- run: |
18-
source test_env/bin/activate
19-
cd "autonormalize-$(python setup.py --version)/"
20-
pytest
21-
22-
jobs:
23-
"python-27":
24-
working_directory: ~/auto-norm
3+
executors:
4+
python:
5+
parameters:
6+
image_tag:
7+
type: string
8+
default: python:3.7
259
docker:
26-
- image: circleci/python:2.7
27-
steps:
28-
- checkout
29-
- run: virtualenv test_env && virtualenv dev_env
30-
- install-packaged-autonormalize
31-
- run: source dev_env/bin/activate && make installdeps
32-
- run: source dev_env/bin/activate && make lint
33-
- run-packaged-tests
10+
- image: circleci/<< parameters.image_tag >>
3411

35-
"python-35":
36-
working_directory: ~/auto-norm
37-
docker:
38-
- image: circleci/python:3.5
12+
commands:
13+
installation:
3914
steps:
4015
- checkout
41-
- run: virtualenv test_env && virtualenv dev_env
42-
- install-packaged-autonormalize
43-
- run: source dev_env/bin/activate && make installdeps
44-
- run: source dev_env/bin/activate && make lint
45-
- run-packaged-tests
16+
- run:
17+
name: Installation
18+
command: |
19+
python setup.py sdist
20+
PACKAGE=$(python setup.py --fullname)
21+
tar -zxvf dist/${PACKAGE}.tar.gz
22+
mv ${PACKAGE} package
23+
virtualenv python -q
24+
source python/bin/activate
25+
pip install -e package --progress-bar off
26+
pip install -r package/test-requirements.txt --progress-bar off
4627
47-
"python-36":
48-
working_directory: ~/auto-norm
49-
docker:
50-
- image: circleci/python:3.6
28+
jobs:
29+
Lint Tests:
30+
parameters:
31+
image_tag:
32+
type: string
33+
default: python:3.7
34+
executor:
35+
name: python
36+
image_tag: << parameters.image_tag >>
5137
steps:
52-
- checkout
53-
- run: virtualenv test_env && virtualenv dev_env
54-
- install-packaged-autonormalize
55-
- run: source dev_env/bin/activate && make installdeps
56-
- run: source dev_env/bin/activate && make lint
57-
- run-packaged-tests
38+
- installation
39+
- run:
40+
name: Lint Tests
41+
command: |
42+
source python/bin/activate
43+
make -C package lint --makefile ../Makefile
5844
59-
"python-37":
60-
working_directory: ~/auto-norm
61-
docker:
62-
- image: circleci/python:3.7
45+
Unit Tests:
46+
parameters:
47+
image_tag:
48+
type: string
49+
default: python:3.7
50+
codecov:
51+
type: boolean
52+
default: false
53+
executor:
54+
name: python
55+
image_tag: << parameters.image_tag >>
6356
steps:
64-
- checkout
65-
- run: virtualenv test_env && virtualenv dev_env
66-
- install-packaged-autonormalize
67-
- run: source dev_env/bin/activate && make installdeps
68-
- run: source dev_env/bin/activate && make lint
69-
- run-packaged-tests
57+
- installation
58+
- run:
59+
name: Unit Tests
60+
command: |
61+
source python/bin/activate
62+
pytest autonormalize/
63+
- when:
64+
condition: << parameters.codecov >>
65+
steps:
66+
- run:
67+
name: Code Coverage
68+
command: |
69+
source python/bin/activate
70+
cd package
71+
codecov
7072
73+
Entry Point Test:
74+
parameters:
75+
image_tag:
76+
type: string
77+
default: python:3.7
78+
executor:
79+
name: python
80+
image_tag: << parameters.image_tag >>
81+
steps:
82+
- installation
83+
- run:
84+
name: Entry Point Test
85+
command: |
86+
source python/bin/activate
87+
make -C package entry-point-test --makefile ../Makefile
7188
7289
workflows:
7390
version: 2
74-
test_all_python_versions:
91+
Integration Tests:
7592
jobs:
76-
- "python-27"
77-
- "python-35"
78-
- "python-36"
79-
- "python-37"
93+
- Lint Tests:
94+
name: Py35 - Lint Tests
95+
image_tag: python:3.5
96+
- Lint Tests:
97+
name: Py36 - Lint Tests
98+
image_tag: python:3.6
99+
- Lint Tests:
100+
name: Py37 - Lint Tests
101+
image_tag: python:3.7
102+
- Unit Tests:
103+
name: Py35 - Unit Tests
104+
image_tag: python:3.5
105+
- Unit Tests:
106+
name: Py36 - Unit Tests
107+
image_tag: python:3.6
108+
- Unit Tests:
109+
name: Py37 - Unit Tests
110+
image_tag: python:3.7
111+
codecov: true
112+
- Entry Point Test:
113+
name: Py35 - Entry Point Test
114+
image_tag: python:3.5
115+
- Entry Point Test:
116+
name: Py36 - Entry Point Test
117+
image_tag: python:3.6
118+
- Entry Point Test:
119+
name: Py37 - Entry Point Test
120+
image_tag: python:3.7

‎.github/main.workflow‎

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

‎.github/workflows/release.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
on:
2+
release:
3+
types: [published]
4+
5+
name: Release
6+
jobs:
7+
pypi:
8+
name: PyPI Release
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@master
12+
- name: PyPI Upload
13+
uses: FeatureLabs/gh-action-pypi-upload@master
14+
env:
15+
PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
16+
PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
17+
TEST_PYPI_USERNAME: ${{ secrets.TEST_PYPI_USERNAME }}
18+
TEST_PYPI_PASSWORD: ${{ secrets.TEST_PYPI_PASSWORD }}

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.DS_Store
2+
13
# IDE
24
.vscode
35

‎Makefile‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
1-
.PHONY: clean
2-
clean:
3-
find . -name '*.pyo' -delete
4-
find . -name '*.pyc' -delete
5-
find . -name __pycache__ -delete
6-
find . -name '*~' -delete
7-
8-
.PHONY: lint
9-
lint:
10-
flake8 autonormalize && isort --check-only --recursive autonormalize
1+
.PHONY: entry-point-test
2+
entry-point-test:
3+
cd ~ && python -c "from featuretools import autonormalize"
114

125
.PHONY: lint-fix
136
lint-fix:
14-
autopep8 --in-place --recursive --max-line-length=100 --select="E225,E303,E302,E203,E128,E231,E251,E271,E127,E126,E301,W291,W293,E226,E306,E221" autonormalize
7+
select="E225,E303,E302,E203,E128,E231,E251,E271,E127,E126,E301,W291,W293,E226,E306,E221"
8+
autopep8 --in-place --recursive --max-line-length=100 --select=${select} autonormalize
159
isort --recursive autonormalize
1610

11+
.PHONY: lint
12+
lint:
13+
flake8 autonormalize
14+
isort --check-only --recursive autonormalize
15+
1716
.PHONY: test
18-
test:
19-
pytest autonormalize/tests
17+
test: lint
18+
pytest autonormalize/
2019

2120
.PHONY: testcoverage
2221
testcoverage: lint
23-
pytest autonormalize/tests --cov=autonormalize
24-
25-
.PHONY: installdeps
26-
installdeps:
27-
pip install --upgrade pip -q
28-
pip install -e . -q
29-
pip install -r dev-requirements.txt -q
22+
pytest autonormalize/ --cov=autonormalize

‎autonormalize/.DS_Store‎

-10 KB
Binary file not shown.

‎autonormalize/demos/.DS_Store‎

-6 KB
Binary file not shown.

‎autonormalize/examples/.DS_Store‎

-6 KB
Binary file not shown.

‎autonormalize/tests/.DS_Store‎

-6 KB
Binary file not shown.

0 commit comments

Comments
 (0)