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

Prevent installation of cantera from PyPI #33

Merged
merged 6 commits into from
Aug 10, 2022
Merged

Conversation

ischoegl
Copy link
Member

@ischoegl ischoegl commented Aug 9, 2022

When running pip install in build.sh/.bat, fetching cantera from PyPi needs to be prevented.

Closes #31

Closes #30 (via Cantera/cantera#1358)
Circumvents #29 (MKL is disabled)

Output with manually built package:

>>> import cantera as ct
>>> ct.__version__
'3.0.0a2'

Other fixes:

@ischoegl
Copy link
Member Author

ischoegl commented Aug 9, 2022

Alright. I believe this is ready for a review.

Curiously, mkl is used despite not explicitly including it in the SCons configuration ... this is the output I get after locally building and installing:

conda list --show-channel-urls
# packages in environment at /opt/conda/envs/ct-test:
#
# Name                    Version                   Build  Channel
_libgcc_mutex             0.1                        main    defaults
_openmp_mutex             5.1                       1_gnu    defaults
blas                      1.0                         mkl    defaults
bzip2                     1.0.8                h7b6447c_0    defaults
ca-certificates           2022.07.19           h06a4308_0    defaults
cantera                   3.0.0a2         py310h6cd0baa_0    file:///opt/conda/envs/conda-bld/conda-bld
certifi                   2022.6.15       py310h06a4308_0    defaults
h5py                      3.7.0           py310he06866b_0    defaults
hdf5                      1.10.6               h3ffc7dd_1    defaults
intel-openmp              2021.4.0          h06a4308_3561    defaults
ld_impl_linux-64          2.38                 h1181459_1    defaults
libcantera                3.0.0a2              h3fd9d12_0    file:///opt/conda/envs/conda-bld/conda-bld
libffi                    3.3                  he6710b0_2    defaults
libgcc-ng                 11.2.0               h1234567_1    defaults
libgfortran-ng            11.2.0               h00389a5_1    defaults
libgfortran5              11.2.0               h1234567_1    defaults
libgomp                   11.2.0               h1234567_1    defaults
libstdcxx-ng              11.2.0               h1234567_1    defaults
libuuid                   1.0.3                h7f8727e_2    defaults
mkl                       2021.4.0           h06a4308_640    defaults
mkl-service               2.4.0           py310h7f8727e_0    defaults
mkl_fft                   1.3.1           py310hd6ae3a3_0    defaults
mkl_random                1.2.2           py310h00e6091_0    defaults
ncurses                   6.3                  h5eee18b_3    defaults
numpy                     1.23.1          py310h1794996_0    defaults
numpy-base                1.23.1          py310hcba007f_0    defaults
openssl                   1.1.1q               h7f8727e_0    defaults
pip                       22.1.2          py310h06a4308_0    defaults
python                    3.10.4               h12debd9_0    defaults
readline                  8.1.2                h7f8727e_1    defaults
ruamel.yaml               0.16.10         py310h7f8727e_1    defaults
ruamel.yaml.clib          0.2.6           py310h7f8727e_0    defaults
setuptools                61.2.0          py310h06a4308_0    defaults
six                       1.16.0             pyhd3eb1b0_1    defaults
sqlite                    3.39.2               h5082296_0    defaults
tk                        8.6.12               h1ccaba5_0    defaults
tzdata                    2022a                hda174b7_0    defaults
wheel                     0.37.1             pyhd3eb1b0_0    defaults
xz                        5.2.5                h7f8727e_1    defaults
zlib                      1.2.12               h7f8727e_2    defaults

@ischoegl ischoegl marked this pull request as ready for review August 9, 2022 15:00
@ischoegl ischoegl requested a review from a team August 9, 2022 15:00
@bryanwweber
Copy link
Member

NumPy pulls in MKL, so that's not totally surprising. I think we'd like to link Cantera to MKL as well, but we can fix that in a separate PR. Thanks for taking this on!

Copy link
Member

@speth speth left a comment

Choose a reason for hiding this comment

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

Ah, nice job solving the mystery of how this could result in having Cantera 2.6.0 installed. I guess I shouldn't have been surprised that it was a result of pip doing something wrong.

@ischoegl
Copy link
Member Author

ischoegl commented Aug 9, 2022

@bryanwweber ... let me know if you have anything else to add? Won't merge this myself as this is the first time I'm working on this repo.

Copy link
Member

@bryanwweber bryanwweber left a comment

Choose a reason for hiding this comment

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

Thanks, a couple of tiny things here

cantera/meta.yaml Outdated Show resolved Hide resolved
cantera/build.sh Show resolved Hide resolved
MKL is disabled as a temporary fix of Cantera#29 to resolve Cantera#31. It should be
reactivated in a permanent fix.
Starting with Cantera 3.0, the Python test suite is no longer packaged
with the Python module. This commit ensures that conda is still able
to run the tests.
@ischoegl
Copy link
Member Author

@bryanwweber ... thanks! Comments should be taken care of.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Conda Install Development Cantera Version 3.0.0a2 Conda path replacement mangling Cantera data directories
3 participants