Skip to content

Commit

Permalink
Bump pillow 9 (#157)
Browse files Browse the repository at this point in the history
* Bump Pillow to 9.0.0

* Update Makefile comment

* Update README to deprecate Python 3.6

* Update setup.py to deprecate Python 3.6

* Bump autocrop version to 1.3.0

* Update changelog for 1.3.0

* Remove CI for Python3.6
  • Loading branch information
leblancfg authored Jan 25, 2022
1 parent 0fcd118 commit f12f85d
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python: ["3.6", "3.7", "3.8", "3.9", "3.10",]
python: ["3.7", "3.8", "3.9", "3.10",]
experimental: [false]
include:
- os: ubuntu-latest
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,14 @@ install:
( \
. env/bin/activate; \
pip install -r requirements.txt; \
pip install -r requirements-dev.txt; \
python setup.py install; \
)

initial_setup: venv install
@printf "\n\n"
@printf "${CYAN} ► Initial setup successful.${NC}\n\n"
@printf "${CYAN} ► Activate your environment with: ${RED}. env/bin/activate${NC}\n\n"
@printf "${CYAN} ► Activate your environment with: ${RED}source env/bin/activate${NC}\n\n"
@printf "${CYAN} ► Once you're done, deactivate with: ${RED}deactivate${NC}\n\n"

.PHONY: pypi-test pypi test test-all lint check docs venv install initial_setup
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Best practice for your projects is of course to [use virtual environments](http:

Autocrop is [currently being tested on](https://github.com/leblancfg/autocrop/actions/workflows/ci.yml):

* Python 3.6 to 3.10
* Python 3.7 to 3.10
* OS:
- Linux
- macOS
Expand Down
2 changes: 1 addition & 1 deletion autocrop/__version__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__title__ = "autocrop"
__description__ = "Automatically crops faces from batches of pictures"
__author__ = "François Leblanc"
__version__ = "1.2.0"
__version__ = "1.3.0"
10 changes: 10 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 1.3.0 - 2022-01-25
### Changes

- The `initial-setup` step in Makefile now also installs development packages.
- The `black` formatting package now gets installed with `requirements-dev.txt`

### Deprecations

- Deprecate Python 3.6

## 1.2.0 - 2021-11-26
### Changes

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
numpy>=1.10
opencv-python-headless>=3, <5
Pillow>=8.3.2
Pillow>=9.0.0
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
AUTHOR = "François Leblanc"

# What packages are required for this module to be executed?
REQUIRED = ["numpy>=1.10", "opencv-python-headless>=3, <5", "Pillow~=8.3.2"]
REQUIRED = ["numpy>=1.10", "opencv-python-headless>=3, <5", "Pillow>=9.0.0"]

# The rest you shouldn't have to touch too much :)
# ------------------------------------------------
Expand Down Expand Up @@ -94,9 +94,10 @@ def run(self):
# Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
"License :: OSI Approved :: BSD License",
"Programming Language :: Python",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3 :: Only",
],
# $ setup.py publish support.
Expand Down

0 comments on commit f12f85d

Please sign in to comment.