Skip to content

Commit

Permalink
Fixed installation from sdist not working
Browse files Browse the repository at this point in the history
Fixes #331. Fixes #332. Fixes #333.
  • Loading branch information
agronholm committed Jan 27, 2020
1 parent 8b23127 commit 79e3ec4
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeqa-test-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: pip install .[test]
run: "pip install --no-binary=:all: .[test]"
- name: Test with pytest
run: pytest

Expand Down
9 changes: 9 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
recursive-include src *.py
recursive-include tests *.py *.h *.txt *.c *.dynlib
recursive-include docs *.py *.rst make.bat Makefile
include tests/testdata/test-1.0-py2.py3-none-any.whl
include tox.ini
include manpages/*.rst
prune tests/testdata/*/build
prune tests/testdata/*/dist
prune tests/testdata/*/*.egg-info
15 changes: 10 additions & 5 deletions docs/development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,13 @@ The wheel project welcomes help in the following ways:
Release Process
---------------

To make a new release, edit ``docs/news.rst`` and add a new version and replace
``**UNRELEASED**`` with a release version and date, like
``**X.Y.Z (20XX-YY-ZZ)**``. The github workflow will pick up the new version
and create a new tag, which will then trigger the release workflow which will
package the project and publish the resulting artifacts to PyPI.
To make a new release:

#. Edit ``docs/news.rst`` and replace ``**UNRELEASED**`` with a release version
and date, like ``**X.Y.Z (20XX-YY-ZZ)**``.
#. Replace the ``__version__`` attribute in ``src/wheel/__init__.py`` with the
same version number as above (without the date of course).

The github workflow will pick up the new version from ``news.rst`` and create a
new tag, which will then trigger the release workflow which will package the
project and publish the resulting artifacts to PyPI.
5 changes: 5 additions & 0 deletions docs/news.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Release Notes
=============

**UNRELEASED**

- Fixed installation of ``wheel`` from sdist which was broken due to a chicken
and egg problem with PEP 517 and setuptools_scm

**0.34.0 (2020-01-27)**

- Dropped Python 3.4 support
Expand Down
7 changes: 0 additions & 7 deletions pyproject.toml

This file was deleted.

2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[metadata]
name = wheel
version = attr: wheel.__version__
description = A built-package format for Python
long_description = file: README.rst
classifiers =
Expand Down Expand Up @@ -32,7 +33,6 @@ package_dir=
= src
packages = find:
python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
setup_requires = setuptools_scm >= 3.4
zip_safe = False

[options.packages.find]
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from setuptools import setup

setup(use_scm_version=True)
setup()
2 changes: 1 addition & 1 deletion src/wheel/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from ._version import version as __version__ # noqa: F401
__version__ = '0.34.1'
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
envlist = py27, py35, py36, py37, py38, pypy, pypy3, flake8
minversion = 3.3.0
skip_missing_interpreters = true
isolated_build = true

[testenv]
commands = pytest {posargs}
Expand Down

0 comments on commit 79e3ec4

Please sign in to comment.