diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1398d62..d080478 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/Makefile b/Makefile index e1b39c2..33cfe82 100755 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/README.md b/README.md index edffe7a..be98ad6 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/autocrop/__version__.py b/autocrop/__version__.py index db8f460..f9f3d14 100644 --- a/autocrop/__version__.py +++ b/autocrop/__version__.py @@ -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" diff --git a/changelog.md b/changelog.md index f498dfc..1b0e77a 100644 --- a/changelog.md +++ b/changelog.md @@ -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 diff --git a/requirements.txt b/requirements.txt index 53fba90..155c6b5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ numpy>=1.10 opencv-python-headless>=3, <5 -Pillow>=8.3.2 +Pillow>=9.0.0 diff --git a/setup.py b/setup.py index ce84e02..6434587 100644 --- a/setup.py +++ b/setup.py @@ -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 :) # ------------------------------------------------ @@ -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.