Skip to content

Add compatibility with setuptools 66+ #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mildaniel merged 2 commits into from
Mar 31, 2023
Merged

Add compatibility with setuptools 66+ #475

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3aab0da
Add compatibility with setuptools 66+
jfly Mar 25, 2023
1f7cb6c
Merge branch 'develop' into issue-474
moelasmar Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions tests/functional/workflows/python_pip/test_packager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,14 +902,14 @@ def test_setup_tar_gz_hyphens_in_name(self, osutils, sdist_reader):
# The whole reason we need to use the egg info to get the name and
# version is that we cannot deterministically parse that information
# from the filenames themselves. This test puts hyphens in the name
# and version which would break a simple ``split("-")`` attempt to get
# that information.
setup_py = self._SETUP_PY % (self._SETUPTOOLS, "foo-bar", "1.0-2b")
# which would break a simple ``split("-")`` attempt to get that
# information.
setup_py = self._SETUP_PY % (self._SETUPTOOLS, "foo-bar", "1.2b2")
with osutils.tempdir() as tempdir:
filepath = self._write_fake_sdist(setup_py, tempdir, "tar.gz")
name, version = sdist_reader.get_package_name_and_version(filepath)
assert name == "foo-bar"
assert version == "1.0-2b"
assert version == "1.2b2"

def test_setup_zip(self, osutils, sdist_reader):
setup_py = self._SETUP_PY % (self._SETUPTOOLS, "foo", "1.0")
Expand Down Expand Up @@ -944,20 +944,20 @@ def test_distutil_zip(self, osutils, sdist_reader):
assert version == "1.0"

def test_both_tar_gz(self, osutils, sdist_reader):
setup_py = self._SETUP_PY % (self._BOTH, "foo-bar", "1.0-2b")
setup_py = self._SETUP_PY % (self._BOTH, "foo-bar", "1.0b2")
with osutils.tempdir() as tempdir:
filepath = self._write_fake_sdist(setup_py, tempdir, "tar.gz")
name, version = sdist_reader.get_package_name_and_version(filepath)
assert name == "foo-bar"
assert version == "1.0-2b"
assert version == "1.0b2"

def test_both_tar_bz2(self, osutils, sdist_reader):
setup_py = self._SETUP_PY % (self._BOTH, "foo-bar", "1.0-2b")
setup_py = self._SETUP_PY % (self._BOTH, "foo-bar", "1.0b2")
with osutils.tempdir() as tempdir:
filepath = self._write_fake_sdist(setup_py, tempdir, "tar.bz2")
name, version = sdist_reader.get_package_name_and_version(filepath)
assert name == "foo-bar"
assert version == "1.0-2b"
assert version == "1.0b2"

def test_both_zip(self, osutils, sdist_reader):
setup_py = self._SETUP_PY % (self._BOTH, "foo", "1.0")
Expand Down