Navigation Menu

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix make installs and dependency checks #578

Merged
merged 7 commits into from Apr 3, 2020
Merged

Fix make installs and dependency checks #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9217b4e
Fix make installs and github action
jeremyliweishih Apr 2, 2020
2a6604a
Fix circleci
jeremyliweishih Apr 2, 2020
c8d2698
Cl
jeremyliweishih Apr 2, 2020
38cbdc7
Fix circleci syntax
jeremyliweishih Apr 2, 2020
d27f870
Fix latest
jeremyliweishih Apr 2, 2020
40beba6
Test whether -r actually works..
jeremyliweishih Apr 2, 2020
dda5459
Remove statsmodels
jeremyliweishih Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Expand Up @@ -16,20 +16,25 @@ executors:
OMP_NUM_THREADS: 8

commands:
install_dependencies:
steps:
- run: |
virtualenv test_python -q
source test_python/bin/activate
make installdeps
install_dependencies_test:
steps:
- run: |
virtualenv test_python -q
source test_python/bin/activate
make installdeps-test
pip install -r test-requirements.txt
install_dependencies_dev:
steps:
- run: |
virtualenv test_python -q
source test_python/bin/activate
make installdeps
pip install -r test-requirements.txt
make installdeps-dev
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think -r at the top works in circleci

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what you mean--are you talking about pip install's -r? I think that will still work.

So isn't the make installdeps above redundant? Because pip install -r dev-requirements.txt will install requirements.txt? I suggest you delete that and just keep make installdeps-dev here

install_dependencies_core:
steps:
- run: |
Expand Down Expand Up @@ -157,6 +162,7 @@ jobs:
- unless:
condition: << parameters.core_dependencies >>
steps:
- install_dependencies
- install_dependencies_test
- run: |
source test_python/bin/activate
Expand Down Expand Up @@ -216,7 +222,7 @@ jobs:
python_version: << parameters.python_version >>
steps:
- checkout
- install_dependencies_dev
- install_dependencies
jeremyliweishih marked this conversation as resolved.
Show resolved Hide resolved
- run:
name: "Detect Dependency Changes"
command: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency_check.yml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Update dependencies
id: vars
run: |
make installdeps-test
make installdeps
make dependenciesfile DEPENDENCY_FILE_PATH=evalml/tests/latest_dependency_versions.txt
cat evalml/tests/latest_dependency_versions.txt
- name: Create Pull Request
Expand Down
14 changes: 9 additions & 5 deletions Makefile
View file
Open in desktop
Expand Up @@ -30,16 +30,20 @@ circleci-test-minimal-deps:
win-circleci-test:
pytest evalml/ -n 4 --doctest-modules --cov=evalml --junitxml=test-reports/junit.xml --doctest-continue-on-failure -v

.PHONY: installdeps-test
installdeps-test:
.PHONY: installdeps
installdeps:
pip install --upgrade pip -q
pip install -e . -q

.PHONY: installdeps
installdeps: installdeps-test
.PHONY: installdeps-test
installdeps-test: installdeps-test
pip install -r test-requirements.txt -q

.PHONY: installdeps-dev
installdeps-dev: installdeps-dev
jeremyliweishih marked this conversation as resolved.
Show resolved Hide resolved
pip install -r dev-requirements.txt -q

.PHONY: dependenciesfile
dependenciesfile:
$(eval whitelist='pandas|numpy|scikit|xgboost|catboost|category-encoders|cloudpickle|distributed|pyzmq|statsmodels')
$(eval whitelist='pandas|numpy|scikit|xgboost|catboost|cloudpickle|distributed|pyzmq')
pip freeze | grep -v "FeatureLabs/evalml.git" | grep -E $(whitelist) > $(DEPENDENCY_FILE_PATH)
1 change: 1 addition & 0 deletions docs/source/changelog.rst
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@ Changelog
* Changes
* Documentation Changes
* Testing Changes
* Matched install commands of `check_latest_dependencies` test and it's GitHub action :pr:`578`
jeremyliweishih marked this conversation as resolved.
Show resolved Hide resolved

**v0.8.0 Apr. 1, 2020**
* Enhancements
Expand Down
2 changes: 0 additions & 2 deletions evalml/tests/latest_dependency_versions.txt
View file
Open in desktop
@@ -1,10 +1,8 @@
catboost==0.22
category-encoders==2.1.0
cloudpickle==1.3.0
numpy==1.18.2
pandas==1.0.3
pyzmq==19.0.0
scikit-learn==0.22.2.post1
scikit-optimize==0.7.4
statsmodels==0.11.1
xgboost==1.0.2