Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bob
bob.io.video
Commits
da907035
Commit
da907035
authored
Oct 07, 2014
by
André Anjos
💬
Browse files
Only use Pillow, not PIL anymore
parent
0c01b721
Changes
2
Show whitespace changes
Inline
Side-by-side
requirements.txt
View file @
da907035
setuptools
pillow
bob.extension
bob.blitz
bob.core
...
...
setup.py
View file @
da907035
...
...
@@ -27,15 +27,6 @@ packages = [
version
=
'2.0.0a0'
# Check if python-imaging means pil or pillow
pil_or_pillow
=
[]
try
:
import
pkg_resources
pkg_resources
.
require
(
'PIL'
)
pil_or_pillow
.
append
(
'pil'
)
except
pkg_resources
.
DistributionNotFound
as
e
:
pil_or_pillow
.
append
(
'pillow'
)
define_macros
=
[(
'__STDC_CONSTANT_MACROS'
,
None
)]
# Checks if we have avformat_alloc_output_context2 defined in libavformat
...
...
@@ -70,8 +61,8 @@ setup(
include_package_data
=
True
,
zip_safe
=
False
,
setup_requires
=
build_requires
+
pil_or_pillow
,
install_requires
=
build_requires
+
pil_or_pillow
,
setup_requires
=
build_requires
,
install_requires
=
build_requires
,
namespace_packages
=
[
"bob"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment