From 1506f487cd38088a59c0056621d819deedafd23d Mon Sep 17 00:00:00 2001 From: Justintime50 <39606064+Justintime50@users.noreply.github.com> Date: Mon, 13 Feb 2023 11:21:00 -0700 Subject: [PATCH] fix: use build package for build process --- .gitignore | 39 ++++++++++++++++----------------------- .isort.cfg | 9 --------- Makefile | 2 +- pyproject.toml | 8 ++++++++ setup.cfg | 2 -- setup.py | 2 ++ 6 files changed, 27 insertions(+), 35 deletions(-) delete mode 100644 .isort.cfg delete mode 100644 setup.cfg diff --git a/.gitignore b/.gitignore index 24d68cf1..a5191c81 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1,25 @@ -.env +._* +.AppleDouble .cache +.coverage .DS_Store -.AppleDouble +.env +.env-override +.idea .LSOverride -Icon -._* .Spotlight-V100 -.Trashes - -# virtual environment -venv - -/build -/dist -/MANIFEST -/easypost.egg-info -*.pyc -*.egg .tox +.Trashes +.virtualenv *.class - +*.egg +*.egg-info +*.pyc *.sublime-* - +/MANIFEST +dist +docs/build/ +Icon test +venv virtualenv -.virtualenv -.idea -.coverage -.env-override -/venv* -docs/build/ diff --git a/.isort.cfg b/.isort.cfg deleted file mode 100644 index eae36441..00000000 --- a/.isort.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[settings] -line_length=120 -indent=4 -force_grid_wrap=True -multi_line_output=3 -sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER -lines_after_imports=2 -include_trailing_comma=True -use_parentheses=True diff --git a/Makefile b/Makefile index c4002100..7dad2906 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ black-check: ## build - Builds the project in preparation for release build: - $(VIRTUAL_BIN)/python setup.py sdist bdist_wheel + $(VIRTUAL_BIN)/python -m build ## clean - Remove the virtual environment and clear out .pyc files clean: diff --git a/pyproject.toml b/pyproject.toml index 85c3b073..ca2527d3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,3 +3,11 @@ line-length = 120 [tool.isort] profile = "black" +line_length = 120 +indent = 4 +force_grid_wrap = 2 +multi_line_output = 3 +sections = "FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER" +lines_after_imports = 2 +include_trailing_comma = true +use_parentheses = true diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index aa079ec5..00000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[flake8] -max-line-length=120 diff --git a/setup.py b/setup.py index 62b7c154..5024803e 100644 --- a/setup.py +++ b/setup.py @@ -12,6 +12,7 @@ DEV_REQUIREMENTS = [ "bandit==1.7.1", # Bandit 1.7.2 drops support for Python 3.6 "black==22.*", + "build==0.8.*", "coveralls == 3.*", "flake8==5.*", "isort==5.*", @@ -39,6 +40,7 @@ url="https://easypost.com/", packages=find_packages( exclude=[ + "docs", "examples", "tests", ]