Skip to content

CI: Use conda compiler in environment.yml #27062

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.

Sign up for GitHub

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

Closed
wants to merge 20 commits into from
Closed

CI: Use conda compiler in environment.yml #27062

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d810dda
Improvement to the conda environment to use the compiler from the vir…
marcelotrevisani Jun 26, 2019
a731708
CI Improvements to work with conda compilers
marcelotrevisani Jul 2, 2019
c1b28e5
Revert to use source deactivate
marcelotrevisani Jul 2, 2019
a8eabf9
Build improvements regarding ccache
marcelotrevisani Jul 2, 2019
d819a72
Fix __init__.py
marcelotrevisani Jul 2, 2019
ad4b82c
Fix windows build and force /home/trevisani/miniconda3/envs/test-ccac…
marcelotrevisani Jul 2, 2019
a322411
Removed compiler option
marcelotrevisani Jul 2, 2019
bb5706c
Fix ccache command
marcelotrevisani Jul 2, 2019
e8d80be
Update makefile
marcelotrevisani Jul 2, 2019
ef24547
reset makefile
marcelotrevisani Jul 2, 2019
3313c85
readd --compiler
marcelotrevisani Jul 2, 2019
a4136e5
add --compiler to the build extension
marcelotrevisani Jul 2, 2019
8a70b52
Update build command
marcelotrevisani Jul 2, 2019
335f8bf
Setting gcc to CC
marcelotrevisani Jul 2, 2019
83e5795
Forcing to use GCC env var
marcelotrevisani Jul 22, 2019
7bc4b87
Merge branch 'master' into conda-env
marcelotrevisani Jul 22, 2019
27fa92e
Setting gcc to be CC
marcelotrevisani Jul 22, 2019
97c84f8
Setting gcc
marcelotrevisani Jul 22, 2019
e789326
Reset
marcelotrevisani Jul 22, 2019
630415a
Merge remote-tracking branch 'origin/master' into conda-env
marcelotrevisani Sep 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ clean_pyc:
-find . -name '*.py[co]' -exec rm {} \;

build: clean_pyc
python setup.py build_ext --inplace
python setup.py build_ext --inplace --compiler=$CC
Copy link
Contributor

Choose a reason for hiding this comment

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

this is not used in our CI at all, though I do use it locally, so nice to improve this generally.

We should add some documentation (in contributing.rst) that things exist & work (not 100% sure this actually works on windows; the Makefile)

Copy link
Author

Choose a reason for hiding this comment

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

That is true, unless pandas is using mingw it will not going to use it, indeed
but this part I am just enforcing it, because cython usually already uses the $CC


lint-diff:
git diff upstream/master --name-only -- "*.py" | xargs flake8
Expand Down
5 changes: 3 additions & 2 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ dependencies:

# building
- cython>=0.28.2
- cxx-compiler
- zlib
Copy link
Member

Choose a reason for hiding this comment

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

can you add a short description why those are needed

Copy link
Author

Choose a reason for hiding this comment

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

Sure! I will add the explanation, actually the zlib we can remove since it is already a dependency of other packages

Copy link
Author

Choose a reason for hiding this comment

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

I also think that the conda-forge channel should be prioritized by the defaults
since not all of the packages are present on the default channel and the project is using the missing packages from conda-forge, you might see some problems in the future (unlikely) but it is better to avoid any kind of problem

But I can create another PR for that


# code checks
- cpplint
Expand Down Expand Up @@ -79,5 +81,4 @@ dependencies:
- xlrd # pandas.read_excel, DataFrame.to_excel, pandas.ExcelWriter, pandas.ExcelFile
- xlsxwriter # pandas.read_excel, DataFrame.to_excel, pandas.ExcelWriter, pandas.ExcelFile
- xlwt # pandas.read_excel, DataFrame.to_excel, pandas.ExcelWriter, pandas.ExcelFile
- pip:
- pyreadstat # pandas.read_spss
- pyreadstat # pandas.read_spss
Copy link
Member

Choose a reason for hiding this comment

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

Can you revert this change here please. After that, you should run ./scripts/generate_pip_deps_from_conda.py so requirements.txt is synchronized with the changes here.

Copy link
Author

@marcelotrevisani marcelotrevisani Jun 28, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Sure, I will rebase my branch from master and that should be reverted