Skip to content

Commit e6cb726

Browse files
Update install tests (#123)
* update install tests * update Makefile * update release notes * fix typo
1 parent 9170d22 commit e6cb726

File tree

5 files changed

+22
-17
lines changed

5 files changed

+22
-17
lines changed

.github/workflows/install_test.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,17 @@ jobs:
2828
with:
2929
ref: ${{ github.event.pull_request.head.ref }}
3030
repository: ${{ github.event.pull_request.head.repo.full_name }}
31-
- name: Install requirements
32-
run: |
33-
pip config --site set global.progress_bar off
34-
pip install -r requirements.txt
35-
pip install -r complete-requirements.txt
36-
pip install -r test-requirements.txt
3731
- name: Create source distribution
3832
run: make package_nlp_primitives
39-
- name: Install source distribution
33+
- name: Install nlp_primtivies from sdist
4034
run: |
4135
NLP_PRIMITIVES_VERSION=$(python setup.py --version)
4236
pip install dist/nlp_primitives-${NLP_PRIMITIVES_VERSION}.tar.gz
43-
- name: Run unit tests
37+
- name: Test by importing
4438
run: |
4539
cd nlp_primitives
4640
python -c "import nlp_primitives; print(nlp_primitives.__version__)"
4741
python -c "import sys; print(sys.path)"
48-
make -f ../Makefile unit-tests
42+
- name: Check package conflicts
43+
run: |
44+
python -m pip check

.github/workflows/lint_check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ jobs:
3030
make installdeps-complete
3131
pip install -r test-requirements.txt
3232
- name: Run lint tests
33-
run: make lint-tests
33+
run: make lint

.github/workflows/unit_tests_with_latest_deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ jobs:
3636
name: Install latest version of Featuretools from main branch
3737
run: pip install git+https://github.com/alteryx/featuretools.git@main#egg=featuretools --force-reinstall
3838
- name: Run unit tests
39-
run: make unit-tests
39+
run: make test

Makefile

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ lint-fix:
2121
autopep8 --in-place --recursive --max-line-length=100 --select=${select} nlp_primitives
2222
isort --recursive nlp_primitives
2323

24-
.PHONY: lint-tests
25-
lint-tests:
24+
.PHONY: lint
25+
lint:
2626
flake8 nlp_primitives
2727
isort --check-only nlp_primitives
2828

29-
.PHONY: unit-tests
30-
unit-tests:
29+
.PHONY: test
30+
test:
3131
pytest --cache-clear --show-capture=stderr -vv
3232

3333
.PHONY: installdeps
@@ -56,8 +56,16 @@ checkdepscomplete:
5656
$(eval allow_list='featuretools|nltk|tensorflow|tensorflow_hub')
5757
pip freeze | grep -v "nlp_primitives.git" | grep -E $(allow_list) > $(OUTPUT_FILEPATH)
5858

59+
.PHONY: upgradepip
60+
upgradepip:
61+
python -m pip install --upgrade pip
62+
63+
.PHONY: upgradebuild
64+
upgradebuild:
65+
python -m pip install --upgrade build
66+
5967
.PHONY: package_nlp_primitives
60-
package_nlp_primitives:
68+
package_nlp_primitives: upgradepip upgradebuild
6169
python setup.py sdist
6270
$(eval PACKAGE=$(shell python setup.py --version))
6371
tar -zxvf "dist/nlp_primitives-${PACKAGE}.tar.gz"

docs/source/changelog.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ Future Release
1010
* Speed up LSA primitive initialization (:pr:`118`)
1111
* Documentation Changes
1212
* Testing Changes
13+
* Fix install test and update Makefile (:pr:`123`)
1314

1415
Thanks to the following people for contributing to this release:
15-
:user:`rwedge`
16+
:user:`rwedge`, :user:`thehomebrewnerd`
1617

1718
v2.4.0 Mar 31, 2022
1819
===================

0 commit comments

Comments
 (0)