Skip to content

Commit

Permalink
Updated pillow version due to security issues (thumbor#1390)
Browse files Browse the repository at this point in the history
* Updated pillow version due to security issues
* Removing python 3.6 from build
  • Loading branch information
heynemann authored Jan 24, 2022
1 parent c622dea commit fa29ba0
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 63 deletions.
34 changes: 0 additions & 34 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,46 +6,12 @@ orbs:
workflows:
ci:
jobs:
- build-and-test-python36
- build-and-test-python37
- build-and-test-python38
- build-and-test-python39
- build-and-test-python310

jobs:
build-and-test-python36:
working_directory: /app
docker:
- image: thumbororg/thumbor-test:36
steps:
- checkout
- run:
name: Update dependencies
command: make setup
- run:
name: Compile Extensions
command: make compile_ext
- run:
name: Redis
command: make redis
- run:
name: Run Unit Tests
command: make sequential-unit
- store_test_results: # Upload test results for display in Test Summary: https://circleci.com/docs/2.0/collect-test-data/
path: test-results
- store_artifacts: # Upload test summary for display in Artifacts: https://circleci.com/docs/2.0/artifacts/
path: test-results
destination: tr1
- run:
name: Run Integration Tests
command: env ASYNC_TEST_TIMEOUT=30 make integration_run
- run:
name: Lint
command: make flake pylint
- run:
name: Coverage
command: env COVERALLS_REPO_TOKEN=$COVERALLS_REPO_TOKEN coveralls

build-and-test-python37:
working_directory: /app
docker:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ jobs:
fail-fast: false
matrix:
image-tag:
- 36
- 37
- 38
- 39
Expand Down
16 changes: 3 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -154,21 +154,11 @@ sample_images:
# the watermark filter's logic is too complicated to reproduce with IM, the watermark test images can't be generated here
# similarly, the noise, colorize, redeye and fill filters generate output too unique to be reproduce with IM and can't be generated here

test-docker-build: test-docker-36-build test-docker-37-build test-docker-38-build test-docker-39-build test-docker310-build
test-docker-build: test-docker-37-build test-docker-38-build test-docker-39-build test-docker310-build

test-docker-run: test-docker-36-run test-docker-37-run test-docker-38-run test-docker-39-run test-docker-310-run
test-docker-run: test-docker-37-run test-docker-38-run test-docker-39-run test-docker-310-run

test-docker-publish: test-docker-36-publish test-docker-37-publish test-docker-38-publish test-docker-39-publish test-docker-310-publish

test-docker-36-build:
@docker build -f TestDockerfile36 -t thumbor-test-36 .

test-docker-36-run:
@docker run -v "$$(pwd):/app" thumbororg/thumbor-test:36 make compile_ext redis sequential-unit integration flake

test-docker-36-publish:
@docker image tag thumbor-test-36:latest thumbororg/thumbor-test:36
@docker push thumbororg/thumbor-test:36
test-docker-publish: test-docker-37-publish test-docker-38-publish test-docker-39-publish test-docker-310-publish

test-docker-37-build:
@docker build -f TestDockerfile37 -t thumbor-test-37 .
Expand Down
14 changes: 0 additions & 14 deletions TestDockerfile36

This file was deleted.

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def run_setup(extension_modules=None):
"derpconf==0.*,>=0.8.3",
"libthumbor==2.*,>=2.0.0",
"opencv-python-headless==4.*,>=4.2.0",
"Pillow>=8.4.0,<9",
"Pillow>=9.0.0",
"pytz>=2019.3.0",
"statsd==3.*,>=3.3.0",
"socketfromfd>=0.2.0",
Expand Down

0 comments on commit fa29ba0

Please sign in to comment.