From 354efbca1833d5b1158dd108b827407b2e886d7f Mon Sep 17 00:00:00 2001 From: Jeff Hernandez <12969559+jeff-hernandez@users.noreply.github.com> Date: Mon, 25 Nov 2019 10:10:06 -0600 Subject: [PATCH 01/10] GitHub Action - PyPI Upload (#16) --- .github/main.workflow | 12 ------------ .github/workflows/release.yml | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 12 deletions(-) delete mode 100644 .github/main.workflow create mode 100644 .github/workflows/release.yml diff --git a/.github/main.workflow b/.github/main.workflow deleted file mode 100644 index c63d0e7..0000000 --- a/.github/main.workflow +++ /dev/null @@ -1,12 +0,0 @@ -workflow "Release" { - on = "release" - resolves = ["PyPI"] -} - -action "PyPI" { - uses = "FeatureLabs/gh-action-pypi-upload@master" - secrets = ["PYPI_USERNAME", "PYPI_PASSWORD"] - env = { - TWINE_REPOSITORY_URL = "https://upload.pypi.org/legacy/" - } -} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..4c7d2cb --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,18 @@ +on: + release: + types: [published] + +name: Release +jobs: + pypi: + name: PyPI Release + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: PyPI Upload + uses: FeatureLabs/gh-action-pypi-upload@master + env: + PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }} + PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + TEST_PYPI_USERNAME: ${{ secrets.TEST_PYPI_USERNAME }} + TEST_PYPI_PASSWORD: ${{ secrets.TEST_PYPI_PASSWORD }} \ No newline at end of file From e5306e87e1882316967a901e9d301fcea0824ca6 Mon Sep 17 00:00:00 2001 From: Jeff Hernandez <12969559+jeff-hernandez@users.noreply.github.com> Date: Tue, 26 Nov 2019 15:37:03 -0600 Subject: [PATCH 02/10] Integration Test Updates (#15) --- .DS_Store | Bin 12292 -> 0 bytes .circleci/config.yml | 156 +++++++++++++++++++++++++----------------- .gitignore | 2 + Makefile | 33 +++------ dev-requirements.txt | 5 -- requirements.txt | 5 +- test-requirements.txt | 6 +- 7 files changed, 111 insertions(+), 96 deletions(-) delete mode 100644 .DS_Store delete mode 100755 dev-requirements.txt diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 848c186a93e777e582d1e12971b5b2afd0496c22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12292 zcmeHN&2Jk;6n~SZjhzp&X%j*b5*7g|Qqw3-n$ieWb=?+-N@-e0C8aIy+TJ*;u6NDu zI-jJ-Lb}RcKqIa{NBu) zd2dZbBHyTFiAISih0IjzMKvBWJ$Q&D{+)A6I)EC1JcEp~M&y%2HnK~#7Vf=Q(SafH z_&bsNNT)_@{5n}=(mENX6|Y{hoD#V1m+F@3`4bZlM8|>7gNM3O>2xaHm%3G0a#jky z?l-)=?%t43X2mFl<$1@knq|Fo%`{eu+Tc0I_I1-X+z9*4_e{IutmK`BUGZc)bGp9- zS=muh8{XK+o;W#{nb{o6Y-A^oS5(E+i5(J(#1j5rHrJVQA8Vt#N69f_j+91I8A%n~`7t*bOO4ETa zzC!cwe1(r5M}3CbL31J93TPlsA`mAL_RNk8 zCn0+W&ENq^M>UQvb&GK^S`-*S2ecvB7t?B)C_w@EX*RKs6J~A*k zFf=su{P55VM_)Wz)Q*(&@|~*7e(X8Na@@StFm6;`vr?$*Wz()M_{OSVFxQQuc35G( zYE(XWST(;^2hZTc3fbISu3^}+y~~S>p5ZSPwSKScI+iu(c&2YU_VviG*Kd08&u4w3 zHft|B=y4ey_~kmYdDjfr18tFCxURddZdZ-`+AT{j8P;Vx@A$q`TQJLx9gMtRHjBqO z*We~c&ioocJd(S(T^J1t8jS=6#8NadZ#%Y;9?8uGb!iyCV|11-(KWh*ki#eRIeksv z(tY}YexW}^m(av3;+QxgPKz_*Z80k@iaBvbydQ{ngf@|0+U_Et;s)pr%3UtFw&mDW zaB&OWR7S`{Cl4P3d7SFBHfuTMF!;fi^$p~Ef69as%bW*q4I!U#1WUk=@J~sR`BIS? zqzYt~={Ukf27QRIiz!PrJlP1raL+!ilCQL*_I(KLEF!lVr}$XuvlDy{=I6!RlzgL+ z`84_VSkPyB>eN_f`XonvW+pi3GnxJSK_6h!oS&lmG_YTV?rYGYg>sRyaij=Z6sZVO ztrC-Q2{F8@#FQcdt?kms2}RPb0JKqIYPP&d~*W zmkM-2;Z}EQ3KmI+MKaL7$?GD{&l--6r3d_H(ef<4i5?0xFRg;DNU0d~x0iyfi}^3c zrRh6dI@cmI(y(ILj%qD+ft(F_9=T${#1$a&azs8&S25PJuw$1%$FTz{@g7@j zNq0=*ZabNl_0c8A$UBSetBNBd61A!d_a3uFQ`0kJnaPQNZHtsyDi%qTh&}e{(2;{) z4@UGlvYR~g=3$Q=$H_27S$tkcX%e5~&`};MehIYEx)#JwkzUehql}*T?DNrL%ZVwi zVAS5QgaO_Lc*h~TNY!{B9lEj_QZb2^9wdL%rVOEV-VgpiIbmb=x4+p^are6c?-LQ7 zX-`D@kta3plo+Cze3B9b5(E+i5(J(;0)yxxEe|4g!q@>c@NLGAB>EmkdL(x2@zE8N z*khNJC*?4;!A7~LbOJrTg12#3W5;2WZ=WL7oS%YE*ET-5P&L%x06Ro6loalLij^`; z1+nfXVkTBr;7BSi1G}*?NAfUangJL%k7c0EJNXW-nGSxDftC2KmhM~h;`mr?>{E?A z*4!06X~4X#!;5;4R;aGvtp=s~z{er8?dv*gO%F5|m!vPSOMZ{o-yJ0Pn0}s=v$(^I z6|D>aRSpQ~aOV&{K`9LVp?(duHL~L9N*68a)b)b%?(Tuj7RPIcP^;48SJ3CrO?}F! z(0}d!!+snLt{0>H{{On+a diff --git a/.circleci/config.yml b/.circleci/config.yml index e54592b..101e598 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,79 +1,107 @@ version: 2.1 -commands: - install-packaged-autonormalize: - description: "install autonormalize from source distribution" - steps: - - run : | - source test_env/bin/activate - python setup.py sdist - AUTONORMALIZE_VERSION=$(python setup.py --version) - tar -zxvf "dist/autonormalize-${AUTONORMALIZE_VERSION}.tar.gz" - pip install -e "autonormalize-${AUTONORMALIZE_VERSION}/" - pip install -r "autonormalize-${AUTONORMALIZE_VERSION}/test-requirements.txt" - run-packaged-tests: - description: "run unit tests on packaged testing files" - steps: - - run: | - source test_env/bin/activate - cd "autonormalize-$(python setup.py --version)/" - pytest - -jobs: - "python-27": - working_directory: ~/auto-norm +executors: + python: + parameters: + image_tag: + type: string + default: "python:3.7" docker: - - image: circleci/python:2.7 - steps: - - checkout - - run: virtualenv test_env && virtualenv dev_env - - install-packaged-autonormalize - - run: source dev_env/bin/activate && make installdeps - - run: source dev_env/bin/activate && make lint - - run-packaged-tests + - image: circleci/<< parameters.image_tag >> - "python-35": - working_directory: ~/auto-norm - docker: - - image: circleci/python:3.5 +commands: + installation: steps: - checkout - - run: virtualenv test_env && virtualenv dev_env - - install-packaged-autonormalize - - run: source dev_env/bin/activate && make installdeps - - run: source dev_env/bin/activate && make lint - - run-packaged-tests + - run: + name: "Package Installation to Virtual Environment" + command: | + python setup.py sdist + PACKAGE=$(python setup.py --fullname) + tar -zxvf "dist/${PACKAGE}.tar.gz" + mv ${PACKAGE} package + virtualenv python -q + source python/bin/activate + pip install -e package --progress-bar off + pip install -r package/test-requirements.txt --progress-bar off - "python-36": - working_directory: ~/auto-norm - docker: - - image: circleci/python:3.6 +jobs: + lint_tests: + parameters: + image_tag: + type: string + default: "python:3.7" + executor: + name: python + image_tag: << parameters.image_tag >> steps: - - checkout - - run: virtualenv test_env && virtualenv dev_env - - install-packaged-autonormalize - - run: source dev_env/bin/activate && make installdeps - - run: source dev_env/bin/activate && make lint - - run-packaged-tests + - installation + - run: + name: "Lint Tests" + command: | + source python/bin/activate + make -C package lint-tests --makefile ../Makefile - "python-37": - working_directory: ~/auto-norm - docker: - - image: circleci/python:3.7 + unit_tests: + parameters: + image_tag: + type: string + default: "python:3.7" + executor: + name: python + image_tag: << parameters.image_tag >> steps: - - checkout - - run: virtualenv test_env && virtualenv dev_env - - install-packaged-autonormalize - - run: source dev_env/bin/activate && make installdeps - - run: source dev_env/bin/activate && make lint - - run-packaged-tests + - installation + - run: + name: "Unit Tests" + command: | + source python/bin/activate + make -C package unit-tests --makefile ../Makefile + entry_point_test: + parameters: + image_tag: + type: string + default: "python:3.7" + executor: + name: python + image_tag: << parameters.image_tag >> + steps: + - installation + - run: + name: "Entry Point Test" + command: | + source python/bin/activate + make -C package entry-point-test --makefile ../Makefile workflows: version: 2 - test_all_python_versions: + "Integration Tests": jobs: - - "python-27" - - "python-35" - - "python-36" - - "python-37" + - lint_tests: + name: "Lint Tests - Python 3.5" + image_tag: "python:3.5" + - lint_tests: + name: "Lint Tests - Python 3.6" + image_tag: "python:3.6" + - lint_tests: + name: "Lint Tests - Python 3.7" + image_tag: "python:3.7" + - unit_tests: + name: "Unit Tests - Python 3.5" + image_tag: "python:3.5" + - unit_tests: + name: "Unit Tests - Python 3.6" + image_tag: "python:3.6" + - unit_tests: + name: "Unit Tests - Python 3.7" + image_tag: "python:3.7" + - entry_point_test: + name: "Entry Point Test - Python 3.5" + image_tag: "python:3.5" + - entry_point_test: + name: "Entry Point Test - Python 3.6" + image_tag: "python:3.6" + - entry_point_test: + name: "Entry Point Test - Python 3.7" + image_tag: "python:3.7" diff --git a/.gitignore b/.gitignore index a45d83e..cb363bf 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.DS_Store + # IDE .vscode diff --git a/Makefile b/Makefile index 9b37043..fc11d1a 100755 --- a/Makefile +++ b/Makefile @@ -1,29 +1,14 @@ -.PHONY: clean -clean: - find . -name '*.pyo' -delete - find . -name '*.pyc' -delete - find . -name __pycache__ -delete - find . -name '*~' -delete +entry-point-test: + cd ~ && python -c "from featuretools import autonormalize" -.PHONY: lint -lint: - flake8 autonormalize && isort --check-only --recursive autonormalize - -.PHONY: lint-fix lint-fix: - 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 + select="E225,E303,E302,E203,E128,E231,E251,E271,E127,E126,E301,W291,W293,E226,E306,E221" + autopep8 --in-place --recursive --max-line-length=100 --select=${select} autonormalize isort --recursive autonormalize -.PHONY: test -test: - pytest autonormalize/tests - -.PHONY: testcoverage -testcoverage: lint - pytest autonormalize/tests --cov=autonormalize +lint-tests: + flake8 autonormalize + isort --check-only --recursive autonormalize -.PHONY: installdeps -installdeps: - pip install --upgrade pip -q - pip install -e . -q - pip install -r dev-requirements.txt -q \ No newline at end of file +unit-tests: + pytest --cache-clear --show-capture=stderr -vv diff --git a/dev-requirements.txt b/dev-requirements.txt deleted file mode 100755 index 745e663..0000000 --- a/dev-requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ --r test-requirements.txt -codecov==2.0.15 -flake8==3.7.0 -autopep8==1.4.3 -isort==4.3.4 diff --git a/requirements.txt b/requirements.txt index 9e70e6f..6db33ce 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ +featuretools>=0.4.0 numpy>=1.13.3 pandas>=0.23.0 -tqdm>=4.19.2 -featuretools>=0.0.0 \ No newline at end of file +python-dateutil>=2.6.1,<2.8.1 +tqdm>=4.19.2 \ No newline at end of file diff --git a/test-requirements.txt b/test-requirements.txt index 4efa87f..0283030 100755 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,7 @@ +autopep8==1.4.3 +codecov==2.0.15 +flake8==3.7.0 +isort==4.3.4 pytest==4.4.1 -pytest-xdist==1.26.1 pytest-cov==2.6.1 +pytest-xdist==1.26.1 \ No newline at end of file From ff0e55727fe542a5b0d1883c682ec86697632f91 Mon Sep 17 00:00:00 2001 From: Jeff Hernandez <12969559+jeff-hernandez@users.noreply.github.com> Date: Wed, 4 Dec 2019 14:45:18 -0600 Subject: [PATCH 03/10] Codecov (#17) --- .circleci/config.yml | 93 +++++++++++++++++++++++++------------------- Makefile | 3 +- 2 files changed, 55 insertions(+), 41 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 101e598..9b24561 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ executors: parameters: image_tag: type: string - default: "python:3.7" + default: python:3.7 docker: - image: circleci/<< parameters.image_tag >> @@ -14,11 +14,11 @@ commands: steps: - checkout - run: - name: "Package Installation to Virtual Environment" + name: Installation command: | python setup.py sdist PACKAGE=$(python setup.py --fullname) - tar -zxvf "dist/${PACKAGE}.tar.gz" + tar -zxvf dist/${PACKAGE}.tar.gz mv ${PACKAGE} package virtualenv python -q source python/bin/activate @@ -26,82 +26,95 @@ commands: pip install -r package/test-requirements.txt --progress-bar off jobs: - lint_tests: + Lint Tests: parameters: image_tag: type: string - default: "python:3.7" + default: python:3.7 executor: name: python image_tag: << parameters.image_tag >> steps: - installation - run: - name: "Lint Tests" + name: Lint Tests command: | source python/bin/activate make -C package lint-tests --makefile ../Makefile - unit_tests: + Unit Tests: parameters: image_tag: type: string - default: "python:3.7" + default: python:3.7 + codecov: + type: boolean + default: false executor: name: python image_tag: << parameters.image_tag >> steps: - installation - run: - name: "Unit Tests" + name: Unit Tests command: | source python/bin/activate make -C package unit-tests --makefile ../Makefile + - when: + condition: << parameters.codecov >> + steps: + - run: + name: Code Coverage + command: | + source python/bin/activate + cd package + codecov - entry_point_test: + Entry Point Test: parameters: image_tag: type: string - default: "python:3.7" + default: python:3.7 executor: name: python image_tag: << parameters.image_tag >> steps: - installation - run: - name: "Entry Point Test" + name: Entry Point Test command: | source python/bin/activate make -C package entry-point-test --makefile ../Makefile workflows: version: 2 - "Integration Tests": + Integration Tests: jobs: - - lint_tests: - name: "Lint Tests - Python 3.5" - image_tag: "python:3.5" - - lint_tests: - name: "Lint Tests - Python 3.6" - image_tag: "python:3.6" - - lint_tests: - name: "Lint Tests - Python 3.7" - image_tag: "python:3.7" - - unit_tests: - name: "Unit Tests - Python 3.5" - image_tag: "python:3.5" - - unit_tests: - name: "Unit Tests - Python 3.6" - image_tag: "python:3.6" - - unit_tests: - name: "Unit Tests - Python 3.7" - image_tag: "python:3.7" - - entry_point_test: - name: "Entry Point Test - Python 3.5" - image_tag: "python:3.5" - - entry_point_test: - name: "Entry Point Test - Python 3.6" - image_tag: "python:3.6" - - entry_point_test: - name: "Entry Point Test - Python 3.7" - image_tag: "python:3.7" + - Lint Tests: + name: Py35 - Lint Tests + image_tag: python:3.5 + - Lint Tests: + name: Py36 - Lint Tests + image_tag: python:3.6 + - Lint Tests: + name: Py37 - Lint Tests + image_tag: python:3.7 + - Unit Tests: + name: Py35 - Unit Tests + image_tag: python:3.5 + - Unit Tests: + name: Py36 - Unit Tests + image_tag: python:3.6 + - Unit Tests: + name: Py37 - Unit Tests + image_tag: python:3.7 + codecov: true + - Entry Point Test: + name: Py35 - Entry Point Test + image_tag: python:3.5 + - Entry Point Test: + name: Py36 - Entry Point Test + image_tag: python:3.6 + - Entry Point Test: + name: Py37 - Entry Point Test + image_tag: python:3.7 diff --git a/Makefile b/Makefile index fc11d1a..17f441f 100755 --- a/Makefile +++ b/Makefile @@ -11,4 +11,5 @@ lint-tests: isort --check-only --recursive autonormalize unit-tests: - pytest --cache-clear --show-capture=stderr -vv + coverage erase + pytest --cov=autonormalize --cache-clear --show-capture=stderr -vv From de08dd97a42a0aa5c065bc7ea94256664afa29f8 Mon Sep 17 00:00:00 2001 From: Nate Parsons Date: Thu, 12 Mar 2020 10:16:34 -0500 Subject: [PATCH 04/10] remove .DS_Store files --- autonormalize/.DS_Store | Bin 10244 -> 0 bytes autonormalize/demos/.DS_Store | Bin 6148 -> 0 bytes autonormalize/examples/.DS_Store | Bin 6148 -> 0 bytes autonormalize/tests/.DS_Store | Bin 6148 -> 0 bytes docs/.DS_Store | Bin 6148 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 autonormalize/.DS_Store delete mode 100644 autonormalize/demos/.DS_Store delete mode 100644 autonormalize/examples/.DS_Store delete mode 100644 autonormalize/tests/.DS_Store delete mode 100644 docs/.DS_Store diff --git a/autonormalize/.DS_Store b/autonormalize/.DS_Store deleted file mode 100644 index fc020520c5ca6e90141b362405371d2c8db8a6d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10244 zcmeHM%}(1u5S|4B4nJyIRpROk5{C#SP!Oo96ovEvr%Ivip{+vxfT)fg<);DCpj`S6 z^a)Vkq;F955qjY<9zF0#k=&NsXJ&F)TSAtI6Q)v`o35m~rcrj~Kj z6t3qhR%U`P>yQF?q6VFkOCGhU9@91-3GHFkl#%1_ltbxmZiSGF~#x%(n*Aa8F_SIyrK9Isk&yb9`h zNqxbRvVO@TjXVOTK`pvKzF(mdRp|^lf0f?jn}-?~);eJu;#0)N3T#|a2M9;Du2_s9 ze@2igiF_$r;eI=4yQcQ&4*U{&T#~(HG(T_fSi&fJijl4>V_w#ys2auz^frX^TVt-O zR1TOzn;O)$(pn0-J@n2CPE?wBXPz!G)(O20dFbI?_-Map%8`CAqOT6DbnsWlHKA2f zd%dK?L|c-x>0B9W0^X}r6Jw3e8JtOpgkH1K@3ev$`nA$>8l7$?^G(dm&L!p-tYp$k zu2}DiXI{V9Eq8mJe7XHbzBOv~O7MK-dCvH`TzS=~_e-hA`<~k^H{5z#QGffo;nuu< z-s`!wjt}jI1ut_O#hyG zG&W9+KVv!}Z>~viYIGD|PSDYKGG-^@$K}6^JiMwyd%(&hTx>tU>K5VsfTJY;BDkPU zUA*Dg8j5lWL`aTJv0ob;V?wh`(VVjRwY{~QwzqdUbnIm~a%^V*F>;K#hX diff --git a/autonormalize/demos/.DS_Store b/autonormalize/demos/.DS_Store deleted file mode 100644 index 8b566e4399df6b751ce0fdafa6ad647656cce1e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~&2CdM5QUH1NJMlKu_)~76(AuYv1W5y5~QjHB*Gr@*A{V;TiRv;tGnqt^cDJi zeSq?f?L~f?0vi+|Pc%OEc*Zk6QS4Zf+nWwwNi9iD)Uff8<_@uW(&Afnb|2}bzUovzH2eD<=o_|*nTalRzF$^@ep&VLx5MHZeSRB+ zp7cz+n&MaKJ$k0GdMb(i$w}b#0)0!bhsTuJkv`#7;c?DPoAH>@OcnFl+~b98En+%) zrw>HG(MRpm@2rmB=y5?O?U!; z4a`C4+us9=@d=BBbwp+m7em1q>e3U##c=FC`4tK4h%sC)Jw9B@?9vOxh3u^FgS%W2 zF}In4%)mSYn{n8(`@ggL{XZX+N11`lz<=sEPU25km+~ ix{gD~uHq+X5azsfz#?HC5et(42m~5(lNtD@4EzG7pPGRH diff --git a/autonormalize/examples/.DS_Store b/autonormalize/examples/.DS_Store deleted file mode 100644 index 8617686a600262760eaaa7d23109432f60ccea00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKO-sW-5Pe&FXwXB%i^u!|p?=&$sfV8Z0oAmkLfVK%&|ChwzS&udVJ$J2Qpya> zzRm2u+3eer?Er9-kL4Ih0gUK^gM`f=Cgb9f4MIeC&gXbViAT&ao|VyT3+$r;a&`&N z>=O@I;n(?9i=wOwj;7x&^P7knm$R}bd>|O!h*`;PVc4@ zZYkWY(dOi?&FJ@ZF`3sWZYb>dtC(};Dn6%sV?2`%F%Q@%GD5RI0$v7dOo5#$@B{Q) B(24*6 diff --git a/autonormalize/tests/.DS_Store b/autonormalize/tests/.DS_Store deleted file mode 100644 index 517d89dec00b35a10a268ef0130053acc23fda6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKu};G<5PerFQB)+#1Y<@fBxaVVDg!eg0BzEWN};VNNR%lH|G+QseS84CJ6lzn zrXvWUyXgGvi=Qufw&ECo^q=z!pa-BsS8N@yXfVC6zGbZ#*(ZvPF~t*Zd7Wdi)!PGq zQ30L1uFcsLGgRkqbzRJ}Q86E}hc1sx`q`HmYrtVM3t5f#QR9Vd3#^b~NWaHeN7`h` zNsV>Hl{LoF)>npt%q1_4=vu2itGw0N-3mL$1bHLtv&O3C9OH#KADF9P)`py>&wE9m z<4VpM=6ED~NcI%3J4R5Ysw1%J<_fq1uE38dz&%^7(+%jQE8q&a0&4~I`;gET(}-n2 z`*g6dBLK0@uo>(6v#6XTVj8gw$U8I%RAQh?JYqIflxKuV8$sl*{dNl{S|Lb5_R^iT;Y2o8W+yD`+l@fO=5K$^-I z-T@wgH{lI<9QbB;Q}RPNA_P0q>^GkMW>@~!_Iim(^hSd&kxxV(oUztK^9$pC_7$ty zOamzN7`G^*kjjHpovg53;%`)d*UqCMR_!&#G`D_Hsv`99gK-aj^Sd@g%s;gJmy}RS zF|YR=|H~5JryOIyp%K^|4dEG;RA9c6-kIm+XT4}G)i=OYsLttRc`otscid=PoY`@| zMrUbKl%38uQQN3rX>5AUrq{gYz388+alZ`9QPB(YXZk7`#F333E0tcxVe}-4$4CB+ z2P!MWB#ZMo`tzqrHc;c98fAk*kMk%jPf@EUI`UhS$?omFw%ollZOh5s&Q4qI?R2M8 z&ueXW?;jiw-+!2#PcJ^GS^oaQ*pzvB+IH z1)Ku^lmeo@-{0@ymh9fTa&x@bO87CHjd_*9%Mt{7D+ZUh;w`u~ Date: Thu, 12 Mar 2020 10:18:27 -0500 Subject: [PATCH 05/10] update pandas.util.testing usage --- autonormalize/tests/test_normalize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autonormalize/tests/test_normalize.py b/autonormalize/tests/test_normalize.py index 4956d82..aae4b87 100644 --- a/autonormalize/tests/test_normalize.py +++ b/autonormalize/tests/test_normalize.py @@ -1,5 +1,5 @@ import pandas as pd -from pandas.util.testing import assert_frame_equal +from pandas.testing import assert_frame_equal from autonormalize import classes, normalize From 933179ad4f4b0bec279f9dabeba3b8f49e2ba1f0 Mon Sep 17 00:00:00 2001 From: Nate Parsons Date: Thu, 12 Mar 2020 10:44:27 -0500 Subject: [PATCH 06/10] update Makefile --- Makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 17f441f..8cf7fe5 100755 --- a/Makefile +++ b/Makefile @@ -1,15 +1,22 @@ +.PHONY: entry-point-test entry-point-test: cd ~ && python -c "from featuretools import autonormalize" +.PHONY: lint-fix lint-fix: select="E225,E303,E302,E203,E128,E231,E251,E271,E127,E126,E301,W291,W293,E226,E306,E221" autopep8 --in-place --recursive --max-line-length=100 --select=${select} autonormalize isort --recursive autonormalize -lint-tests: +.PHONY: lint +lint: flake8 autonormalize isort --check-only --recursive autonormalize -unit-tests: - coverage erase - pytest --cov=autonormalize --cache-clear --show-capture=stderr -vv +.PHONY: test +test: lint + pytest autonormalize/ + +.PHONY: testcoverage +testcoverage: lint + pytest autonormalize/ --cov=autonormalize From 8062d29c8195e66fef3ea6d1d7096199ed4219f2 Mon Sep 17 00:00:00 2001 From: Nate Parsons Date: Thu, 12 Mar 2020 10:44:42 -0500 Subject: [PATCH 07/10] lint-fix updates --- autonormalize/tests/test_example.py | 2 +- autonormalize/tests/test_normalize.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autonormalize/tests/test_example.py b/autonormalize/tests/test_example.py index 4496fc2..14e95bf 100644 --- a/autonormalize/tests/test_example.py +++ b/autonormalize/tests/test_example.py @@ -14,7 +14,7 @@ def test_ft_mock_customer(): entityset = an.auto_entityset(df, name="Customer Transactions", time_index='transaction_time') assert set(entityset['transaction_id'].df.columns) == set(['transaction_id', 'session_id', 'transaction_time', - 'product_id', 'amount']) + 'product_id', 'amount']) assert set(entityset['product_id'].df.columns) == set(['product_id', 'brand']) diff --git a/autonormalize/tests/test_normalize.py b/autonormalize/tests/test_normalize.py index aae4b87..0024680 100644 --- a/autonormalize/tests/test_normalize.py +++ b/autonormalize/tests/test_normalize.py @@ -123,7 +123,7 @@ def test_normalize_dataframe(): assert len(new_dfs) == 3 dic_one = {'team': ['Red', 'Red', 'Red', 'Orange', 'Orange', 'Yellow', - 'Yellow', 'Green', 'Green', 'Blue'], + 'Yellow', 'Green', 'Green', 'Blue'], 'jersey_num': [1, 2, 3, 1, 2, 1, 5, 8, 2, 2], 'player_name': ['A', 'B', 'C', 'D', 'A', 'E', 'B', 'A', 'G', 'H']} From 23c7d19319a9ca5fd5f9938db2df8ccfa780b0e6 Mon Sep 17 00:00:00 2001 From: Nate Parsons Date: Thu, 12 Mar 2020 10:51:27 -0500 Subject: [PATCH 08/10] update circleci tests --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9b24561..1093bdb 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: name: Lint Tests command: | source python/bin/activate - make -C package lint-tests --makefile ../Makefile + make -C package lint --makefile ../Makefile Unit Tests: parameters: @@ -59,7 +59,7 @@ jobs: name: Unit Tests command: | source python/bin/activate - make -C package unit-tests --makefile ../Makefile + make -C package test --makefile ../Makefile - when: condition: << parameters.codecov >> steps: From 2bea940131610cdafdfad77c459e9c2a863df094 Mon Sep 17 00:00:00 2001 From: Nate Parsons Date: Thu, 12 Mar 2020 13:32:27 -0500 Subject: [PATCH 09/10] update circleci tests --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1093bdb..917962d 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,7 +59,7 @@ jobs: name: Unit Tests command: | source python/bin/activate - make -C package test --makefile ../Makefile + pytest autonormalize/ - when: condition: << parameters.codecov >> steps: From 764a652fadf1a7ec544c3447120d11aa29a11435 Mon Sep 17 00:00:00 2001 From: Roy Wedge Date: Thu, 2 Apr 2020 09:26:00 -0400 Subject: [PATCH 10/10] Fix Codecov checkin test(#22) * Use pytest-cov plugin for CI tests * CI - run unit tests on packaged files --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 917962d..6471e65 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,7 +59,8 @@ jobs: name: Unit Tests command: | source python/bin/activate - pytest autonormalize/ + cd package + pytest autonormalize/ --cov=autonormalize - when: condition: << parameters.codecov >> steps: