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

Fix imports #10

Merged
merged 3 commits into from Jul 14, 2022
Merged

Fix imports #10

merged 3 commits into from Jul 14, 2022

Conversation

skupr-anaconda
Copy link

@skupr-anaconda skupr-anaconda commented Jul 14, 2022

Fix PILLOW VERSION double quotes in setup.py for python 3.7 and python 3.8.
I think it's a bug in the source code https://github.com/python-pillow/Pillow/blob/e42d8b089084dac7604be656bebed522363ffd86/setup.py#L849-L856

@skupr-anaconda skupr-anaconda self-assigned this Jul 14, 2022
@skupr-anaconda
Copy link
Author

I opened an issue python-pillow/Pillow#6437

@hugovk
Copy link

hugovk commented Jul 14, 2022

The win-64 CI fails here, what do the logs say?

@skupr-anaconda
Copy link
Author

skupr-anaconda commented Jul 14, 2022

The win-64 CI fails here, what do the logs say?

win-64 agent here isn't stable, it failed by another reason. Right now I use another internal CI system and it succeeded:


set PREFIX=C:\ci\pillow_1657789722059\_test_env
set SRC_DIR=C:\ci\pillow_1657789722059\test_tmp

(base) %SRC_DIR%>call "%SRC_DIR%\conda_test_env_vars.bat" 

(base) %SRC_DIR%>set "CONDA_SHLVL="   && 

(base) %SRC_DIR%>conda activate "%PREFIX%" 

(%PREFIX%) %SRC_DIR%>IF 0 NEQ 0 exit /B 1 

(%PREFIX%) %SRC_DIR%>"%PREFIX%\python.exe" -s "%SRC_DIR%\run_test.py" 
import: 'PIL'
import: 'PIL.Image'
import: 'PIL'
import: 'PIL.Image'

(%PREFIX%) %SRC_DIR%>IF 0 NEQ 0 exit /B 1 

(%PREFIX%) %SRC_DIR%>call "%SRC_DIR%\run_test.bat" 

(%PREFIX%) %SRC_DIR%>pip check 
No broken requirements found.

(%PREFIX%) %SRC_DIR%>IF 0 NEQ 0 exit /B 1 

(%PREFIX%) %SRC_DIR%>exit /B 0 

(%PREFIX%) %SRC_DIR%>IF 0 NEQ 0 exit /B 1 

Resource usage statistics from testing pillow:
   Process count: 1
   CPU time: Sys=-, User=-
   Memory: 1.5M
   Disk usage: 896B
   Time elapsed: 0:00:02.0


TEST END: output-artifacts\win-64\pillow-9.2.0-py37hdc2b20a_1.tar.bz2

The source code wasn't changed for a couple of years, and our last build for v9.0.1 was successful, see https://github.com/AnacondaRecipes/pillow-feedstock/pull/8/files.

FYI, the maintainers' compiler is MSVC 19.16.27035.0, (runtime MSVC\14.16.27023), our is vs2017_win-64: 19.16.27032.1-hb4161e2_3 (vs2015_runtime: 14.27.29016-h5e58377_2).

But python versions are different for py37: the maintainers use python 3.7.9 but we use 3.7.13.

Copy link

@tobijk tobijk left a comment

Choose a reason for hiding this comment

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

LGTM

@skupr-anaconda
Copy link
Author

skupr-anaconda commented Jul 14, 2022

The last version of pillow we built (v9.0.1, https://repo.anaconda.com/pkgs/main/win-64/pillow-9.0.1-py37hdc2b20a_0.tar.bz2) was built using conda-build-3.21.7,
Looking at the conda-build changelog for v3.21.9, it was noticed some changes to support the new setuptools >=60.0

I updated the recipe meta.yaml with:

    - setuptools <60  # [win and (py==37 or py==38)]
    - setuptools      # [not (win and (py==37 or py==38))]

And now it succeeded on win for py37-py38, concourse pipeline https://concourse.build.corp.continuum.io/teams/main/pipelines/skupr-pillow-9.2.0_fix

Copy link

@pseudoyim pseudoyim left a comment

Choose a reason for hiding this comment

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

👍 Awesome! Thank you for conferring with the upstream maintainers on this!

@mcg1969 mcg1969 merged commit 0505871 into master Jul 14, 2022
@skupr-anaconda skupr-anaconda deleted the fix_imports branch July 15, 2022 08:16
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.

None yet

5 participants