From bf5f15e236293587dc66415351c1442f09d7f06d Mon Sep 17 00:00:00 2001 From: Justintime50 <39606064+Justintime50@users.noreply.github.com> Date: Thu, 10 Feb 2022 20:41:44 -0700 Subject: [PATCH] fix: Makefile install target --- CHANGELOG.md | 6 ++++++ Makefile | 8 ++++---- pyproject.toml | 2 +- setup.py | 6 +++--- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d92a48..793dfaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG +## v1.7.1 (2022-02-10) + +* Update Makefile install target to not symlink to the home directory +* Update Black to use the `preview` flag +* Bump dev dependencies + ## v1.7.0 (2021-11-29) * Adds `mypy` and type hinting via `py.typed` diff --git a/Makefile b/Makefile index 997a0a6..d8fcad8 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ PYTHON_BINARY := python3 -VIRTUAL_BIN := venv/bin +VIRTUAL_ENV := venv +VIRTUAL_BIN := $(VIRTUAL_ENV)/bin PROJECT_NAME := project_name TEST_DIR := test @@ -17,7 +18,7 @@ coverage: ## clean - Remove the virtual environment and clear out .pyc files clean: - rm -rf ~/.venv/$(PROJECT_NAME)/ venv + rm -rf $(VIRTUAL_ENV) find . -name '*.pyc' -delete rm -rf dist rm -rf build @@ -39,8 +40,7 @@ format-check: black-check isort-check lint mypy ## install - Install the project locally install: - $(PYTHON_BINARY) -m venv ~/.venv/$(PROJECT_NAME)/ - ln -snf ~/.venv/$(PROJECT_NAME)/ venv + $(PYTHON_BINARY) -m venv $(VIRTUAL_ENV) $(VIRTUAL_BIN)/pip install -e ."[dev]" ## isort - Sorts imports throughout the project diff --git a/pyproject.toml b/pyproject.toml index fa0f60e..29916b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [tool.black] -experimental-string-processing = true +preview = true line-length = 120 skip-string-normalization = true diff --git a/setup.py b/setup.py index 62e03e1..27dd7a8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ REQUIREMENTS = [ # Add your list of production dependencies here, eg: - # 'requests == 1.*', + # 'requests == 2.*', ] DEV_REQUIREMENTS = [ @@ -14,8 +14,8 @@ 'flake8', 'isort', 'mypy', - 'pytest == 6.*', - 'pytest-cov == 2.*', + 'pytest == 7.*', + 'pytest-cov == 3.*', ] setuptools.setup(