diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6bad685..dd2c707 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -21,8 +21,6 @@ jobs: - name: Install dependencies run: | make install - python -m pip install --upgrade pip - python -m pip install setuptools wheel twine - name: Get version id: get_version run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/} diff --git a/CHANGELOG.md b/CHANGELOG.md index 90b3fd7..1083f2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased](https://github.com/alexdlaird/hookee/compare/2.1.0...HEAD) ## [2.1.0](https://github.com/alexdlaird/hookee/compare/2.0.8...2.1.0) - 2023-12-04 -### Fixed -- Build improvements. +### Added +- Build improvements, including `wheel` support. ### Changed - Bumped `pyngrok` version required to >7.0.0. diff --git a/Makefile b/Makefile index a546fab..da1a25e 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,9 @@ docs: install local: @rm -rf *.egg-info dist @( \ - $(PYTHON_BIN) setup.py sdist; \ + $(PYTHON_BIN) -m pip install --upgrade pip; \ + $(PYTHON_BIN) -m pip install --upgrade build; \ + $(PYTHON_BIN) -m build; \ $(PYTHON_BIN) -m pip install dist/*.tar.gz; \ ) @@ -50,11 +52,9 @@ validate-release: @if [[ $$(grep "__version__ = \"${VERSION}\"" setup.py) == "" ]] ; then echo "Version not bumped in setup.py" & exit 1 ; fi @if [[ $$(grep "__version__ = \"${VERSION}\"" hookee/hookeemanager.py) == "" ]] ; then echo "Version not bumped in hookee/hookeemanager.py" & exit 1 ; fi -upload: - @rm -rf *.egg-info dist +upload: local @( \ - source venv/bin/activate; \ - python -m pip install twine; \ - python setup.py sdist; \ - python -m twine upload dist/*; \ + $(PYTHON_BIN) -m pip install --upgrade twine; \ + $(PYTHON_BIN) -m build; \ + $(PYTHON_BIN) -m twine upload dist/*; \ )