mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-08-21 13:53:15 -07:00
Updates vendored subliminal to 2.1.0
Updates rarfile to 3.1 Updates stevedore to 3.5.0 Updates appdirs to 1.4.4 Updates click to 8.1.3 Updates decorator to 5.1.1 Updates dogpile.cache to 1.1.8 Updates pbr to 5.11.0 Updates pysrt to 1.1.2 Updates pytz to 2022.6 Adds importlib-metadata version 3.1.1 Adds typing-extensions version 4.1.1 Adds zipp version 3.11.0
This commit is contained in:
Labrys of Knossos
parent
d8da02cb69
commit
f05b09f349
694 changed files with 16621 additions and 11056 deletions
|
|
@ -187,7 +187,9 @@ class CapturedSubprocess(fixtures.Fixture):
|
|||
self.addDetail(self.label + '-stderr', content.text_content(self.err))
|
||||
self.returncode = proc.returncode
|
||||
if proc.returncode:
|
||||
raise AssertionError('Failed process %s' % proc.returncode)
|
||||
raise AssertionError(
|
||||
'Failed process args=%r, kwargs=%r, returncode=%s' % (
|
||||
self.args, self.kwargs, proc.returncode))
|
||||
self.addCleanup(delattr, self, 'out')
|
||||
self.addCleanup(delattr, self, 'err')
|
||||
self.addCleanup(delattr, self, 'returncode')
|
||||
|
|
@ -200,12 +202,15 @@ def _run_cmd(args, cwd):
|
|||
:param cwd: The directory to run the comamnd in.
|
||||
:return: ((stdout, stderr), returncode)
|
||||
"""
|
||||
print('Running %s' % ' '.join(args))
|
||||
p = subprocess.Popen(
|
||||
args, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE, cwd=cwd)
|
||||
streams = tuple(s.decode('latin1').strip() for s in p.communicate())
|
||||
for stream_content in streams:
|
||||
print(stream_content)
|
||||
print('STDOUT:')
|
||||
print(streams[0])
|
||||
print('STDERR:')
|
||||
print(streams[1])
|
||||
return (streams) + (p.returncode,)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ class TestCommands(base.BaseTestCase):
|
|||
stdout, stderr, return_code = self.run_pbr('freeze')
|
||||
self.assertEqual(0, return_code)
|
||||
pkgs = []
|
||||
for l in stdout.split('\n'):
|
||||
pkgs.append(l.split('==')[0].lower())
|
||||
for line in stdout.split('\n'):
|
||||
pkgs.append(line.split('==')[0].lower())
|
||||
pkgs_sort = sorted(pkgs[:])
|
||||
self.assertEqual(pkgs_sort, pkgs)
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@
|
|||
|
||||
import glob
|
||||
import os
|
||||
import sys
|
||||
import tarfile
|
||||
|
||||
import fixtures
|
||||
|
|
@ -74,7 +75,7 @@ class TestCore(base.BaseTestCase):
|
|||
|
||||
self.run_setup('egg_info')
|
||||
stdout, _, _ = self.run_setup('--keywords')
|
||||
assert stdout == 'packaging,distutils,setuptools'
|
||||
assert stdout == 'packaging, distutils, setuptools'
|
||||
|
||||
def test_setup_py_build_sphinx(self):
|
||||
stdout, _, return_code = self.run_setup('build_sphinx')
|
||||
|
|
@ -113,6 +114,12 @@ class TestCore(base.BaseTestCase):
|
|||
def test_console_script_develop(self):
|
||||
"""Test that we develop a non-pkg-resources console script."""
|
||||
|
||||
if sys.version_info < (3, 0):
|
||||
self.skipTest(
|
||||
'Fails with recent virtualenv due to '
|
||||
'https://github.com/pypa/virtualenv/issues/1638'
|
||||
)
|
||||
|
||||
if os.name == 'nt':
|
||||
self.skipTest('Windows support is passthrough')
|
||||
|
||||
|
|
|
|||
|
|
@ -35,17 +35,31 @@ class FilesConfigTest(base.BaseTestCase):
|
|||
])
|
||||
self.useFixture(pkg_fixture)
|
||||
pkg_etc = os.path.join(pkg_fixture.base, 'etc')
|
||||
pkg_ansible = os.path.join(pkg_fixture.base, 'ansible',
|
||||
'kolla-ansible', 'test')
|
||||
dir_spcs = os.path.join(pkg_fixture.base, 'dir with space')
|
||||
dir_subdir_spc = os.path.join(pkg_fixture.base, 'multi space',
|
||||
'more spaces')
|
||||
pkg_sub = os.path.join(pkg_etc, 'sub')
|
||||
subpackage = os.path.join(
|
||||
pkg_fixture.base, 'fake_package', 'subpackage')
|
||||
os.makedirs(pkg_sub)
|
||||
os.makedirs(subpackage)
|
||||
os.makedirs(pkg_ansible)
|
||||
os.makedirs(dir_spcs)
|
||||
os.makedirs(dir_subdir_spc)
|
||||
with open(os.path.join(pkg_etc, "foo"), 'w') as foo_file:
|
||||
foo_file.write("Foo Data")
|
||||
with open(os.path.join(pkg_sub, "bar"), 'w') as foo_file:
|
||||
foo_file.write("Bar Data")
|
||||
with open(os.path.join(pkg_ansible, "baz"), 'w') as baz_file:
|
||||
baz_file.write("Baz Data")
|
||||
with open(os.path.join(subpackage, "__init__.py"), 'w') as foo_file:
|
||||
foo_file.write("# empty")
|
||||
with open(os.path.join(dir_spcs, "file with spc"), 'w') as spc_file:
|
||||
spc_file.write("# empty")
|
||||
with open(os.path.join(dir_subdir_spc, "file with spc"), 'w') as file_:
|
||||
file_.write("# empty")
|
||||
|
||||
self.useFixture(base.DiveDir(pkg_fixture.base))
|
||||
|
||||
|
|
@ -74,5 +88,61 @@ class FilesConfigTest(base.BaseTestCase):
|
|||
)
|
||||
files.FilesConfig(config, 'fake_package').run()
|
||||
self.assertIn(
|
||||
'\netc/pbr/ = \n etc/foo\netc/pbr/sub = \n etc/sub/bar',
|
||||
"\n'etc/pbr/' = \n 'etc/foo'\n'etc/pbr/sub' = \n 'etc/sub/bar'",
|
||||
config['files']['data_files'])
|
||||
|
||||
def test_data_files_with_spaces(self):
|
||||
config = dict(
|
||||
files=dict(
|
||||
data_files="\n 'i like spaces' = 'dir with space'/*"
|
||||
)
|
||||
)
|
||||
files.FilesConfig(config, 'fake_package').run()
|
||||
self.assertIn(
|
||||
"\n'i like spaces/' = \n 'dir with space/file with spc'",
|
||||
config['files']['data_files'])
|
||||
|
||||
def test_data_files_with_spaces_subdirectories(self):
|
||||
# test that we can handle whitespace in subdirectories
|
||||
data_files = "\n 'one space/two space' = 'multi space/more spaces'/*"
|
||||
expected = (
|
||||
"\n'one space/two space/' = "
|
||||
"\n 'multi space/more spaces/file with spc'")
|
||||
config = dict(
|
||||
files=dict(
|
||||
data_files=data_files
|
||||
)
|
||||
)
|
||||
files.FilesConfig(config, 'fake_package').run()
|
||||
self.assertIn(expected, config['files']['data_files'])
|
||||
|
||||
def test_data_files_with_spaces_quoted_components(self):
|
||||
# test that we can quote individual path components
|
||||
data_files = (
|
||||
"\n'one space'/'two space' = 'multi space'/'more spaces'/*"
|
||||
)
|
||||
expected = ("\n'one space/two space/' = "
|
||||
"\n 'multi space/more spaces/file with spc'")
|
||||
config = dict(
|
||||
files=dict(
|
||||
data_files=data_files
|
||||
)
|
||||
)
|
||||
files.FilesConfig(config, 'fake_package').run()
|
||||
self.assertIn(expected, config['files']['data_files'])
|
||||
|
||||
def test_data_files_globbing_source_prefix_in_directory_name(self):
|
||||
# We want to test that the string, "docs", is not replaced in a
|
||||
# subdirectory name, "sub-docs"
|
||||
config = dict(
|
||||
files=dict(
|
||||
data_files="\n share/ansible = ansible/*"
|
||||
)
|
||||
)
|
||||
files.FilesConfig(config, 'fake_package').run()
|
||||
self.assertIn(
|
||||
"\n'share/ansible/' = "
|
||||
"\n'share/ansible/kolla-ansible' = "
|
||||
"\n'share/ansible/kolla-ansible/test' = "
|
||||
"\n 'ansible/kolla-ansible/test/baz'",
|
||||
config['files']['data_files'])
|
||||
|
|
|
|||
|
|
@ -11,7 +11,12 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
try:
|
||||
import configparser
|
||||
except ImportError:
|
||||
import ConfigParser as configparser
|
||||
import os.path
|
||||
import pkg_resources
|
||||
import shlex
|
||||
import sys
|
||||
|
||||
|
|
@ -77,19 +82,35 @@ class TestIntegration(base.BaseTestCase):
|
|||
# We don't break these into separate tests because we'd need separate
|
||||
# source dirs to isolate from side effects of running pip, and the
|
||||
# overheads of setup would start to beat the benefits of parallelism.
|
||||
self.useFixture(base.CapturedSubprocess(
|
||||
'sync-req',
|
||||
['python', 'update.py', os.path.join(REPODIR, self.short_name)],
|
||||
cwd=os.path.join(REPODIR, 'requirements')))
|
||||
self.useFixture(base.CapturedSubprocess(
|
||||
'commit-requirements',
|
||||
'git diff --quiet || git commit -amrequirements',
|
||||
cwd=os.path.join(REPODIR, self.short_name), shell=True))
|
||||
path = os.path.join(
|
||||
self.useFixture(fixtures.TempDir()).path, 'project')
|
||||
self.useFixture(base.CapturedSubprocess(
|
||||
'clone',
|
||||
['git', 'clone', os.path.join(REPODIR, self.short_name), path]))
|
||||
path = os.path.join(REPODIR, self.short_name)
|
||||
setup_cfg = os.path.join(path, 'setup.cfg')
|
||||
project_name = pkg_resources.safe_name(self.short_name).lower()
|
||||
# These projects should all have setup.cfg files but we'll be careful
|
||||
if os.path.exists(setup_cfg):
|
||||
config = configparser.ConfigParser()
|
||||
config.read(setup_cfg)
|
||||
if config.has_section('metadata'):
|
||||
raw_name = config.get('metadata', 'name',
|
||||
fallback='notapackagename')
|
||||
# Technically we should really only need to use the raw
|
||||
# name because all our projects should be good and use
|
||||
# normalized names but they don't...
|
||||
project_name = pkg_resources.safe_name(raw_name).lower()
|
||||
constraints = os.path.join(REPODIR, 'requirements',
|
||||
'upper-constraints.txt')
|
||||
tmp_constraints = os.path.join(
|
||||
self.useFixture(fixtures.TempDir()).path,
|
||||
'upper-constraints.txt')
|
||||
# We need to filter out the package we are installing to avoid
|
||||
# conflicts with the constraints.
|
||||
with open(constraints, 'r') as src:
|
||||
with open(tmp_constraints, 'w') as dest:
|
||||
for line in src:
|
||||
constraint = line.split('===')[0]
|
||||
if project_name != constraint:
|
||||
dest.write(line)
|
||||
pip_cmd = PIP_CMD + ['-c', tmp_constraints]
|
||||
|
||||
venv = self.useFixture(
|
||||
test_packaging.Venv('sdist',
|
||||
modules=['pip', 'wheel', PBRVERSION],
|
||||
|
|
@ -105,7 +126,7 @@ class TestIntegration(base.BaseTestCase):
|
|||
filename = os.path.join(
|
||||
path, 'dist', os.listdir(os.path.join(path, 'dist'))[0])
|
||||
self.useFixture(base.CapturedSubprocess(
|
||||
'tarball', [python] + PIP_CMD + [filename]))
|
||||
'tarball', [python] + pip_cmd + [filename]))
|
||||
venv = self.useFixture(
|
||||
test_packaging.Venv('install-git',
|
||||
modules=['pip', 'wheel', PBRVERSION],
|
||||
|
|
@ -113,7 +134,7 @@ class TestIntegration(base.BaseTestCase):
|
|||
root = venv.path
|
||||
python = venv.python
|
||||
self.useFixture(base.CapturedSubprocess(
|
||||
'install-git', [python] + PIP_CMD + ['git+file://' + path]))
|
||||
'install-git', [python] + pip_cmd + ['git+file://' + path]))
|
||||
if self.short_name == 'nova':
|
||||
found = False
|
||||
for _, _, filenames in os.walk(root):
|
||||
|
|
@ -127,7 +148,7 @@ class TestIntegration(base.BaseTestCase):
|
|||
root = venv.path
|
||||
python = venv.python
|
||||
self.useFixture(base.CapturedSubprocess(
|
||||
'install-e', [python] + PIP_CMD + ['-e', path]))
|
||||
'install-e', [python] + pip_cmd + ['-e', path]))
|
||||
|
||||
|
||||
class TestInstallWithoutPbr(base.BaseTestCase):
|
||||
|
|
@ -188,12 +209,16 @@ class TestInstallWithoutPbr(base.BaseTestCase):
|
|||
class TestMarkersPip(base.BaseTestCase):
|
||||
|
||||
scenarios = [
|
||||
('pip-1.5', {'modules': ['pip>=1.5,<1.6']}),
|
||||
('pip-6.0', {'modules': ['pip>=6.0,<6.1']}),
|
||||
('pip-latest', {'modules': ['pip']}),
|
||||
('setuptools-EL7', {'modules': ['pip==1.4.1', 'setuptools==0.9.8']}),
|
||||
('setuptools-Trusty', {'modules': ['pip==1.5', 'setuptools==2.2']}),
|
||||
('setuptools-minimum', {'modules': ['pip==1.5', 'setuptools==0.7.2']}),
|
||||
('setuptools-Bionic', {
|
||||
'modules': ['pip==9.0.1', 'setuptools==39.0.1']}),
|
||||
('setuptools-Stretch', {
|
||||
'modules': ['pip==9.0.1', 'setuptools==33.1.1']}),
|
||||
('setuptools-EL8', {'modules': ['pip==9.0.3', 'setuptools==39.2.0']}),
|
||||
('setuptools-Buster', {
|
||||
'modules': ['pip==18.1', 'setuptools==40.8.0']}),
|
||||
('setuptools-Focal', {
|
||||
'modules': ['pip==20.0.2', 'setuptools==45.2.0']}),
|
||||
]
|
||||
|
||||
@testtools.skipUnless(
|
||||
|
|
@ -240,25 +265,17 @@ class TestLTSSupport(base.BaseTestCase):
|
|||
# These versions come from the versions installed from the 'virtualenv'
|
||||
# command from the 'python-virtualenv' package.
|
||||
scenarios = [
|
||||
('EL7', {'modules': ['pip==1.4.1', 'setuptools==0.9.8'],
|
||||
'py3support': True}), # And EPEL6
|
||||
('Trusty', {'modules': ['pip==1.5', 'setuptools==2.2'],
|
||||
'py3support': True}),
|
||||
('Jessie', {'modules': ['pip==1.5.6', 'setuptools==5.5.1'],
|
||||
'py3support': True}),
|
||||
# Wheezy has pip1.1, which cannot be called with '-m pip'
|
||||
# So we'll use a different version of pip here.
|
||||
('WheezyPrecise', {'modules': ['pip==1.4.1', 'setuptools==0.6c11'],
|
||||
'py3support': False})
|
||||
('Bionic', {'modules': ['pip==9.0.1', 'setuptools==39.0.1']}),
|
||||
('Stretch', {'modules': ['pip==9.0.1', 'setuptools==33.1.1']}),
|
||||
('EL8', {'modules': ['pip==9.0.3', 'setuptools==39.2.0']}),
|
||||
('Buster', {'modules': ['pip==18.1', 'setuptools==40.8.0']}),
|
||||
('Focal', {'modules': ['pip==20.0.2', 'setuptools==45.2.0']}),
|
||||
]
|
||||
|
||||
@testtools.skipUnless(
|
||||
os.environ.get('PBR_INTEGRATION', None) == '1',
|
||||
'integration tests not enabled')
|
||||
def test_lts_venv_default_versions(self):
|
||||
if (sys.version_info[0] == 3 and not self.py3support):
|
||||
self.skipTest('This combination will not install with py3, '
|
||||
'skipping test')
|
||||
venv = self.useFixture(
|
||||
test_packaging.Venv('setuptools', modules=self.modules))
|
||||
bin_python = venv.python
|
||||
|
|
|
|||
|
|
@ -48,7 +48,10 @@ import tempfile
|
|||
import textwrap
|
||||
|
||||
import fixtures
|
||||
import mock
|
||||
try:
|
||||
from unittest import mock
|
||||
except ImportError:
|
||||
import mock
|
||||
import pkg_resources
|
||||
import six
|
||||
import testscenarios
|
||||
|
|
@ -108,7 +111,7 @@ class GPGKeyFixture(fixtures.Fixture):
|
|||
def setUp(self):
|
||||
super(GPGKeyFixture, self).setUp()
|
||||
tempdir = self.useFixture(fixtures.TempDir())
|
||||
gnupg_version_re = re.compile('^gpg\s.*\s([\d+])\.([\d+])\.([\d+])')
|
||||
gnupg_version_re = re.compile(r'^gpg\s.*\s([\d+])\.([\d+])\.([\d+])')
|
||||
gnupg_version = base._run_cmd(['gpg', '--version'], tempdir.path)
|
||||
for line in gnupg_version[0].split('\n'):
|
||||
gnupg_version = gnupg_version_re.match(line)
|
||||
|
|
@ -120,9 +123,9 @@ class GPGKeyFixture(fixtures.Fixture):
|
|||
else:
|
||||
if gnupg_version is None:
|
||||
gnupg_version = (0, 0, 0)
|
||||
config_file = tempdir.path + '/key-config'
|
||||
f = open(config_file, 'wt')
|
||||
try:
|
||||
|
||||
config_file = os.path.join(tempdir.path, 'key-config')
|
||||
with open(config_file, 'wt') as f:
|
||||
if gnupg_version[0] == 2 and gnupg_version[1] >= 1:
|
||||
f.write("""
|
||||
%no-protection
|
||||
|
|
@ -135,11 +138,9 @@ class GPGKeyFixture(fixtures.Fixture):
|
|||
Name-Comment: N/A
|
||||
Name-Email: example@example.com
|
||||
Expire-Date: 2d
|
||||
Preferences: (setpref)
|
||||
%commit
|
||||
""")
|
||||
finally:
|
||||
f.close()
|
||||
|
||||
# Note that --quick-random (--debug-quick-random in GnuPG 2.x)
|
||||
# does not have a corresponding preferences file setting and
|
||||
# must be passed explicitly on the command line instead
|
||||
|
|
@ -149,6 +150,7 @@ class GPGKeyFixture(fixtures.Fixture):
|
|||
gnupg_random = '--debug-quick-random'
|
||||
else:
|
||||
gnupg_random = ''
|
||||
|
||||
base._run_cmd(
|
||||
['gpg', '--gen-key', '--batch', gnupg_random, config_file],
|
||||
tempdir.path)
|
||||
|
|
@ -173,17 +175,17 @@ class Venv(fixtures.Fixture):
|
|||
"""
|
||||
self._reason = reason
|
||||
if modules == ():
|
||||
pbr = 'file://%s#egg=pbr' % PBR_ROOT
|
||||
modules = ['pip', 'wheel', pbr]
|
||||
modules = ['pip', 'wheel', 'build', PBR_ROOT]
|
||||
self.modules = modules
|
||||
if pip_cmd is None:
|
||||
self.pip_cmd = ['-m', 'pip', 'install']
|
||||
self.pip_cmd = ['-m', 'pip', '-v', 'install']
|
||||
else:
|
||||
self.pip_cmd = pip_cmd
|
||||
|
||||
def _setUp(self):
|
||||
path = self.useFixture(fixtures.TempDir()).path
|
||||
virtualenv.create_environment(path, clear=True)
|
||||
virtualenv.cli_run([path])
|
||||
|
||||
python = os.path.join(path, 'bin', 'python')
|
||||
command = [python] + self.pip_cmd + ['-U']
|
||||
if self.modules and len(self.modules) > 0:
|
||||
|
|
@ -293,23 +295,23 @@ class TestPackagingInGitRepoWithCommit(base.BaseTestCase):
|
|||
self.run_setup('sdist', allow_fail=False)
|
||||
with open(os.path.join(self.package_dir, 'ChangeLog'), 'r') as f:
|
||||
body = f.read()
|
||||
self.assertIn('\*', body)
|
||||
self.assertIn(r'\*', body)
|
||||
|
||||
def test_changelog_handles_dead_links_in_commit(self):
|
||||
self.repo.commit(message_content="See os_ for to_do about qemu_.")
|
||||
self.run_setup('sdist', allow_fail=False)
|
||||
with open(os.path.join(self.package_dir, 'ChangeLog'), 'r') as f:
|
||||
body = f.read()
|
||||
self.assertIn('os\_', body)
|
||||
self.assertIn('to\_do', body)
|
||||
self.assertIn('qemu\_', body)
|
||||
self.assertIn(r'os\_', body)
|
||||
self.assertIn(r'to\_do', body)
|
||||
self.assertIn(r'qemu\_', body)
|
||||
|
||||
def test_changelog_handles_backticks(self):
|
||||
self.repo.commit(message_content="Allow `openstack.org` to `work")
|
||||
self.run_setup('sdist', allow_fail=False)
|
||||
with open(os.path.join(self.package_dir, 'ChangeLog'), 'r') as f:
|
||||
body = f.read()
|
||||
self.assertIn('\`', body)
|
||||
self.assertIn(r'\`', body)
|
||||
|
||||
def test_manifest_exclude_honoured(self):
|
||||
self.run_setup('sdist', allow_fail=False)
|
||||
|
|
@ -379,6 +381,12 @@ class TestPackagingWheels(base.BaseTestCase):
|
|||
wheel_file.extractall(self.extracted_wheel_dir)
|
||||
wheel_file.close()
|
||||
|
||||
def test_metadata_directory_has_pbr_json(self):
|
||||
# Build the path to the scripts directory
|
||||
pbr_json = os.path.join(
|
||||
self.extracted_wheel_dir, 'pbr_testpackage-0.0.dist-info/pbr.json')
|
||||
self.assertTrue(os.path.exists(pbr_json))
|
||||
|
||||
def test_data_directory_has_wsgi_scripts(self):
|
||||
# Build the path to the scripts directory
|
||||
scripts_dir = os.path.join(
|
||||
|
|
@ -531,11 +539,13 @@ class ParseRequirementsTest(base.BaseTestCase):
|
|||
tempdir = tempfile.mkdtemp()
|
||||
requirements = os.path.join(tempdir, 'requirements.txt')
|
||||
with open(requirements, 'w') as f:
|
||||
f.write('-i https://myindex.local')
|
||||
f.write(' --index-url https://myindex.local')
|
||||
f.write(' --extra-index-url https://myindex.local')
|
||||
f.write('-i https://myindex.local\n')
|
||||
f.write(' --index-url https://myindex.local\n')
|
||||
f.write(' --extra-index-url https://myindex.local\n')
|
||||
f.write('--find-links https://myindex.local\n')
|
||||
f.write('arequirement>=1.0\n')
|
||||
result = packaging.parse_requirements([requirements])
|
||||
self.assertEqual([], result)
|
||||
self.assertEqual(['arequirement>=1.0'], result)
|
||||
|
||||
def test_nested_requirements(self):
|
||||
tempdir = tempfile.mkdtemp()
|
||||
|
|
@ -662,12 +672,65 @@ class TestVersions(base.BaseTestCase):
|
|||
version = packaging._get_version_from_git()
|
||||
self.assertThat(version, matchers.StartsWith('2.0.0.dev1'))
|
||||
|
||||
def test_multi_inline_symbols_no_space(self):
|
||||
self.repo.commit()
|
||||
self.repo.tag('1.2.3')
|
||||
self.repo.commit('Sem-ver: feature,api-break')
|
||||
version = packaging._get_version_from_git()
|
||||
self.assertThat(version, matchers.StartsWith('2.0.0.dev1'))
|
||||
|
||||
def test_multi_inline_symbols_spaced(self):
|
||||
self.repo.commit()
|
||||
self.repo.tag('1.2.3')
|
||||
self.repo.commit('Sem-ver: feature, api-break')
|
||||
version = packaging._get_version_from_git()
|
||||
self.assertThat(version, matchers.StartsWith('2.0.0.dev1'))
|
||||
|
||||
def test_multi_inline_symbols_reversed(self):
|
||||
self.repo.commit()
|
||||
self.repo.tag('1.2.3')
|
||||
self.repo.commit('Sem-ver: api-break,feature')
|
||||
version = packaging._get_version_from_git()
|
||||
self.assertThat(version, matchers.StartsWith('2.0.0.dev1'))
|
||||
|
||||
def test_leading_space(self):
|
||||
self.repo.commit()
|
||||
self.repo.tag('1.2.3')
|
||||
self.repo.commit(' sem-ver: api-break')
|
||||
version = packaging._get_version_from_git()
|
||||
self.assertThat(version, matchers.StartsWith('2.0.0.dev1'))
|
||||
|
||||
def test_leading_space_multiline(self):
|
||||
self.repo.commit()
|
||||
self.repo.tag('1.2.3')
|
||||
self.repo.commit(
|
||||
(
|
||||
' Some cool text\n'
|
||||
' sem-ver: api-break'
|
||||
)
|
||||
)
|
||||
version = packaging._get_version_from_git()
|
||||
self.assertThat(version, matchers.StartsWith('2.0.0.dev1'))
|
||||
|
||||
def test_leading_characters_symbol_not_found(self):
|
||||
self.repo.commit()
|
||||
self.repo.tag('1.2.3')
|
||||
self.repo.commit(' ssem-ver: api-break')
|
||||
version = packaging._get_version_from_git()
|
||||
self.assertThat(version, matchers.StartsWith('1.2.4.dev1'))
|
||||
|
||||
def test_tagged_version_has_tag_version(self):
|
||||
self.repo.commit()
|
||||
self.repo.tag('1.2.3')
|
||||
version = packaging._get_version_from_git('1.2.3')
|
||||
self.assertEqual('1.2.3', version)
|
||||
|
||||
def test_tagged_version_with_semver_compliant_prerelease(self):
|
||||
self.repo.commit()
|
||||
self.repo.tag('1.2.3-rc2')
|
||||
version = packaging._get_version_from_git()
|
||||
self.assertEqual('1.2.3.0rc2', version)
|
||||
|
||||
def test_non_canonical_tagged_version_bump(self):
|
||||
self.repo.commit()
|
||||
self.repo.tag('1.4')
|
||||
|
|
@ -724,6 +787,13 @@ class TestVersions(base.BaseTestCase):
|
|||
version = packaging._get_version_from_git('1.2.3')
|
||||
self.assertThat(version, matchers.StartsWith('1.2.3.0a2.dev1'))
|
||||
|
||||
def test_untagged_version_after_semver_compliant_prerelease_tag(self):
|
||||
self.repo.commit()
|
||||
self.repo.tag('1.2.3-rc2')
|
||||
self.repo.commit()
|
||||
version = packaging._get_version_from_git()
|
||||
self.assertEqual('1.2.3.0rc3.dev1', version)
|
||||
|
||||
def test_preversion_too_low_simple(self):
|
||||
# That is, the target version is either already released or not high
|
||||
# enough for the semver requirements given api breaks etc.
|
||||
|
|
@ -750,8 +820,10 @@ class TestVersions(base.BaseTestCase):
|
|||
|
||||
def test_get_kwargs_corner_cases(self):
|
||||
# No tags:
|
||||
git_dir = self.repo._basedir + '/.git'
|
||||
get_kwargs = lambda tag: packaging._get_increment_kwargs(git_dir, tag)
|
||||
|
||||
def get_kwargs(tag):
|
||||
git_dir = self.repo._basedir + '/.git'
|
||||
return packaging._get_increment_kwargs(git_dir, tag)
|
||||
|
||||
def _check_combinations(tag):
|
||||
self.repo.commit()
|
||||
|
|
@ -903,6 +975,235 @@ class TestRequirementParsing(base.BaseTestCase):
|
|||
self.assertEqual(exp_parsed, gen_parsed)
|
||||
|
||||
|
||||
class TestPEP517Support(base.BaseTestCase):
|
||||
def test_pep_517_support(self):
|
||||
# Note that the current PBR PEP517 entrypoints rely on a valid
|
||||
# PBR setup.py existing.
|
||||
pkgs = {
|
||||
'test_pep517':
|
||||
{
|
||||
'requirements.txt': textwrap.dedent("""\
|
||||
sphinx
|
||||
iso8601
|
||||
"""),
|
||||
# Override default setup.py to remove setup_requires.
|
||||
'setup.py': textwrap.dedent("""\
|
||||
#!/usr/bin/env python
|
||||
import setuptools
|
||||
setuptools.setup(pbr=True)
|
||||
"""),
|
||||
'setup.cfg': textwrap.dedent("""\
|
||||
[metadata]
|
||||
name = test_pep517
|
||||
summary = A tiny test project
|
||||
author = PBR Team
|
||||
author-email = foo@example.com
|
||||
home-page = https://example.com/
|
||||
classifier =
|
||||
Intended Audience :: Information Technology
|
||||
Intended Audience :: System Administrators
|
||||
License :: OSI Approved :: Apache Software License
|
||||
Operating System :: POSIX :: Linux
|
||||
Programming Language :: Python
|
||||
Programming Language :: Python :: 2
|
||||
Programming Language :: Python :: 2.7
|
||||
Programming Language :: Python :: 3
|
||||
Programming Language :: Python :: 3.6
|
||||
Programming Language :: Python :: 3.7
|
||||
Programming Language :: Python :: 3.8
|
||||
"""),
|
||||
'pyproject.toml': textwrap.dedent("""\
|
||||
[build-system]
|
||||
requires = ["pbr", "setuptools>=36.6.0", "wheel"]
|
||||
build-backend = "pbr.build"
|
||||
""")},
|
||||
}
|
||||
pkg_dirs = self.useFixture(CreatePackages(pkgs)).package_dirs
|
||||
pkg_dir = pkg_dirs['test_pep517']
|
||||
venv = self.useFixture(Venv('PEP517'))
|
||||
|
||||
# Test building sdists and wheels works. Note we do not use pip here
|
||||
# because pip will forcefully install the latest version of PBR on
|
||||
# pypi to satisfy the build-system requires. This means we can't self
|
||||
# test changes using pip. Build with --no-isolation appears to avoid
|
||||
# this problem.
|
||||
self._run_cmd(venv.python, ('-m', 'build', '--no-isolation', '.'),
|
||||
allow_fail=False, cwd=pkg_dir)
|
||||
|
||||
|
||||
class TestRepositoryURLDependencies(base.BaseTestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(TestRepositoryURLDependencies, self).setUp()
|
||||
self.requirements = os.path.join(tempfile.mkdtemp(),
|
||||
'requirements.txt')
|
||||
with open(self.requirements, 'w') as f:
|
||||
f.write('\n'.join([
|
||||
'-e git+git://git.pro-ject.org/oslo.messaging#egg=oslo.messaging-1.0.0-rc', # noqa
|
||||
'-e git+git://git.pro-ject.org/django-thumborize#egg=django-thumborize', # noqa
|
||||
'-e git+git://git.pro-ject.org/django-thumborize#egg=django-thumborize-beta', # noqa
|
||||
'-e git+git://git.pro-ject.org/django-thumborize#egg=django-thumborize2-beta', # noqa
|
||||
'-e git+git://git.pro-ject.org/django-thumborize#egg=django-thumborize2-beta-4.0.1', # noqa
|
||||
'-e git+git://git.pro-ject.org/django-thumborize#egg=django-thumborize2-beta-1.0.0-alpha.beta.1', # noqa
|
||||
'-e git+git://git.pro-ject.org/django-thumborize#egg=django-thumborize2-beta-1.0.0-alpha-a.b-c-somethinglong+build.1-aef.1-its-okay', # noqa
|
||||
'-e git+git://git.pro-ject.org/django-thumborize#egg=django-thumborize2-beta-2.0.0-rc.1+build.123', # noqa
|
||||
'-e git+git://git.project.org/Proj#egg=Proj1',
|
||||
'git+https://git.project.org/Proj#egg=Proj2-0.0.1',
|
||||
'-e git+ssh://git.project.org/Proj#egg=Proj3',
|
||||
'svn+svn://svn.project.org/svn/Proj#egg=Proj4-0.0.2',
|
||||
'-e svn+http://svn.project.org/svn/Proj/trunk@2019#egg=Proj5',
|
||||
'hg+http://hg.project.org/Proj@da39a3ee5e6b#egg=Proj-0.0.3',
|
||||
'-e hg+http://hg.project.org/Proj@2019#egg=Proj',
|
||||
'hg+http://hg.project.org/Proj@v1.0#egg=Proj-0.0.4',
|
||||
'-e hg+http://hg.project.org/Proj@special_feature#egg=Proj',
|
||||
'git://foo.com/zipball#egg=foo-bar-1.2.4',
|
||||
'pypi-proj1', 'pypi-proj2']))
|
||||
|
||||
def test_egg_fragment(self):
|
||||
expected = [
|
||||
'django-thumborize',
|
||||
'django-thumborize-beta',
|
||||
'django-thumborize2-beta',
|
||||
'django-thumborize2-beta>=4.0.1',
|
||||
'django-thumborize2-beta>=1.0.0-alpha.beta.1',
|
||||
'django-thumborize2-beta>=1.0.0-alpha-a.b-c-long+build.1-aef.1-its-okay', # noqa
|
||||
'django-thumborize2-beta>=2.0.0-rc.1+build.123',
|
||||
'django-thumborize-beta>=0.0.4',
|
||||
'django-thumborize-beta>=1.2.3',
|
||||
'django-thumborize-beta>=10.20.30',
|
||||
'django-thumborize-beta>=1.1.2-prerelease+meta',
|
||||
'django-thumborize-beta>=1.1.2+meta',
|
||||
'django-thumborize-beta>=1.1.2+meta-valid',
|
||||
'django-thumborize-beta>=1.0.0-alpha',
|
||||
'django-thumborize-beta>=1.0.0-beta',
|
||||
'django-thumborize-beta>=1.0.0-alpha.beta',
|
||||
'django-thumborize-beta>=1.0.0-alpha.beta.1',
|
||||
'django-thumborize-beta>=1.0.0-alpha.1',
|
||||
'django-thumborize-beta>=1.0.0-alpha0.valid',
|
||||
'django-thumborize-beta>=1.0.0-alpha.0valid',
|
||||
'django-thumborize-beta>=1.0.0-alpha-a.b-c-somethinglong+build.1-aef.1-its-okay', # noqa
|
||||
'django-thumborize-beta>=1.0.0-rc.1+build.1',
|
||||
'django-thumborize-beta>=2.0.0-rc.1+build.123',
|
||||
'django-thumborize-beta>=1.2.3-beta',
|
||||
'django-thumborize-beta>=10.2.3-DEV-SNAPSHOT',
|
||||
'django-thumborize-beta>=1.2.3-SNAPSHOT-123',
|
||||
'django-thumborize-beta>=1.0.0',
|
||||
'django-thumborize-beta>=2.0.0',
|
||||
'django-thumborize-beta>=1.1.7',
|
||||
'django-thumborize-beta>=2.0.0+build.1848',
|
||||
'django-thumborize-beta>=2.0.1-alpha.1227',
|
||||
'django-thumborize-beta>=1.0.0-alpha+beta',
|
||||
'django-thumborize-beta>=1.2.3----RC-SNAPSHOT.12.9.1--.12+788',
|
||||
'django-thumborize-beta>=1.2.3----R-S.12.9.1--.12+meta',
|
||||
'django-thumborize-beta>=1.2.3----RC-SNAPSHOT.12.9.1--.12',
|
||||
'django-thumborize-beta>=1.0.0+0.build.1-rc.10000aaa-kk-0.1',
|
||||
'django-thumborize-beta>=999999999999999999.99999999999999.9999999999999', # noqa
|
||||
'Proj1',
|
||||
'Proj2>=0.0.1',
|
||||
'Proj3',
|
||||
'Proj4>=0.0.2',
|
||||
'Proj5',
|
||||
'Proj>=0.0.3',
|
||||
'Proj',
|
||||
'Proj>=0.0.4',
|
||||
'Proj',
|
||||
'foo-bar>=1.2.4',
|
||||
]
|
||||
tests = [
|
||||
'egg=django-thumborize',
|
||||
'egg=django-thumborize-beta',
|
||||
'egg=django-thumborize2-beta',
|
||||
'egg=django-thumborize2-beta-4.0.1',
|
||||
'egg=django-thumborize2-beta-1.0.0-alpha.beta.1',
|
||||
'egg=django-thumborize2-beta-1.0.0-alpha-a.b-c-long+build.1-aef.1-its-okay', # noqa
|
||||
'egg=django-thumborize2-beta-2.0.0-rc.1+build.123',
|
||||
'egg=django-thumborize-beta-0.0.4',
|
||||
'egg=django-thumborize-beta-1.2.3',
|
||||
'egg=django-thumborize-beta-10.20.30',
|
||||
'egg=django-thumborize-beta-1.1.2-prerelease+meta',
|
||||
'egg=django-thumborize-beta-1.1.2+meta',
|
||||
'egg=django-thumborize-beta-1.1.2+meta-valid',
|
||||
'egg=django-thumborize-beta-1.0.0-alpha',
|
||||
'egg=django-thumborize-beta-1.0.0-beta',
|
||||
'egg=django-thumborize-beta-1.0.0-alpha.beta',
|
||||
'egg=django-thumborize-beta-1.0.0-alpha.beta.1',
|
||||
'egg=django-thumborize-beta-1.0.0-alpha.1',
|
||||
'egg=django-thumborize-beta-1.0.0-alpha0.valid',
|
||||
'egg=django-thumborize-beta-1.0.0-alpha.0valid',
|
||||
'egg=django-thumborize-beta-1.0.0-alpha-a.b-c-somethinglong+build.1-aef.1-its-okay', # noqa
|
||||
'egg=django-thumborize-beta-1.0.0-rc.1+build.1',
|
||||
'egg=django-thumborize-beta-2.0.0-rc.1+build.123',
|
||||
'egg=django-thumborize-beta-1.2.3-beta',
|
||||
'egg=django-thumborize-beta-10.2.3-DEV-SNAPSHOT',
|
||||
'egg=django-thumborize-beta-1.2.3-SNAPSHOT-123',
|
||||
'egg=django-thumborize-beta-1.0.0',
|
||||
'egg=django-thumborize-beta-2.0.0',
|
||||
'egg=django-thumborize-beta-1.1.7',
|
||||
'egg=django-thumborize-beta-2.0.0+build.1848',
|
||||
'egg=django-thumborize-beta-2.0.1-alpha.1227',
|
||||
'egg=django-thumborize-beta-1.0.0-alpha+beta',
|
||||
'egg=django-thumborize-beta-1.2.3----RC-SNAPSHOT.12.9.1--.12+788', # noqa
|
||||
'egg=django-thumborize-beta-1.2.3----R-S.12.9.1--.12+meta',
|
||||
'egg=django-thumborize-beta-1.2.3----RC-SNAPSHOT.12.9.1--.12',
|
||||
'egg=django-thumborize-beta-1.0.0+0.build.1-rc.10000aaa-kk-0.1', # noqa
|
||||
'egg=django-thumborize-beta-999999999999999999.99999999999999.9999999999999', # noqa
|
||||
'egg=Proj1',
|
||||
'egg=Proj2-0.0.1',
|
||||
'egg=Proj3',
|
||||
'egg=Proj4-0.0.2',
|
||||
'egg=Proj5',
|
||||
'egg=Proj-0.0.3',
|
||||
'egg=Proj',
|
||||
'egg=Proj-0.0.4',
|
||||
'egg=Proj',
|
||||
'egg=foo-bar-1.2.4',
|
||||
]
|
||||
for index, test in enumerate(tests):
|
||||
self.assertEqual(expected[index],
|
||||
re.sub(r'egg=([^&]+).*$',
|
||||
packaging.egg_fragment,
|
||||
test))
|
||||
|
||||
def test_parse_repo_url_requirements(self):
|
||||
result = packaging.parse_requirements([self.requirements])
|
||||
self.assertEqual(['oslo.messaging>=1.0.0-rc',
|
||||
'django-thumborize',
|
||||
'django-thumborize-beta',
|
||||
'django-thumborize2-beta',
|
||||
'django-thumborize2-beta>=4.0.1',
|
||||
'django-thumborize2-beta>=1.0.0-alpha.beta.1',
|
||||
'django-thumborize2-beta>=1.0.0-alpha-a.b-c-somethinglong+build.1-aef.1-its-okay', # noqa
|
||||
'django-thumborize2-beta>=2.0.0-rc.1+build.123',
|
||||
'Proj1', 'Proj2>=0.0.1', 'Proj3',
|
||||
'Proj4>=0.0.2', 'Proj5', 'Proj>=0.0.3',
|
||||
'Proj', 'Proj>=0.0.4', 'Proj',
|
||||
'foo-bar>=1.2.4', 'pypi-proj1',
|
||||
'pypi-proj2'], result)
|
||||
|
||||
def test_parse_repo_url_dependency_links(self):
|
||||
result = packaging.parse_dependency_links([self.requirements])
|
||||
self.assertEqual(
|
||||
[
|
||||
'git+git://git.pro-ject.org/oslo.messaging#egg=oslo.messaging-1.0.0-rc', # noqa
|
||||
'git+git://git.pro-ject.org/django-thumborize#egg=django-thumborize', # noqa
|
||||
'git+git://git.pro-ject.org/django-thumborize#egg=django-thumborize-beta', # noqa
|
||||
'git+git://git.pro-ject.org/django-thumborize#egg=django-thumborize2-beta', # noqa
|
||||
'git+git://git.pro-ject.org/django-thumborize#egg=django-thumborize2-beta-4.0.1', # noqa
|
||||
'git+git://git.pro-ject.org/django-thumborize#egg=django-thumborize2-beta-1.0.0-alpha.beta.1', # noqa
|
||||
'git+git://git.pro-ject.org/django-thumborize#egg=django-thumborize2-beta-1.0.0-alpha-a.b-c-somethinglong+build.1-aef.1-its-okay', # noqa
|
||||
'git+git://git.pro-ject.org/django-thumborize#egg=django-thumborize2-beta-2.0.0-rc.1+build.123', # noqa
|
||||
'git+git://git.project.org/Proj#egg=Proj1',
|
||||
'git+https://git.project.org/Proj#egg=Proj2-0.0.1',
|
||||
'git+ssh://git.project.org/Proj#egg=Proj3',
|
||||
'svn+svn://svn.project.org/svn/Proj#egg=Proj4-0.0.2',
|
||||
'svn+http://svn.project.org/svn/Proj/trunk@2019#egg=Proj5',
|
||||
'hg+http://hg.project.org/Proj@da39a3ee5e6b#egg=Proj-0.0.3',
|
||||
'hg+http://hg.project.org/Proj@2019#egg=Proj',
|
||||
'hg+http://hg.project.org/Proj@v1.0#egg=Proj-0.0.4',
|
||||
'hg+http://hg.project.org/Proj@special_feature#egg=Proj',
|
||||
'git://foo.com/zipball#egg=foo-bar-1.2.4'], result)
|
||||
|
||||
|
||||
def get_soabi():
|
||||
soabi = None
|
||||
try:
|
||||
|
|
|
|||
|
|
@ -10,7 +10,10 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import mock
|
||||
try:
|
||||
from unittest import mock
|
||||
except ImportError:
|
||||
import mock
|
||||
|
||||
from pbr import pbr_json
|
||||
from pbr.tests import base
|
||||
|
|
|
|||
|
|
@ -93,8 +93,9 @@ class SkipFileWrites(base.BaseTestCase):
|
|||
option_dict=self.option_dict)
|
||||
self.assertEqual(
|
||||
not os.path.exists(self.filename),
|
||||
(self.option_value.lower() in options.TRUE_VALUES
|
||||
or self.env_value is not None))
|
||||
(self.option_value.lower() in options.TRUE_VALUES or
|
||||
self.env_value is not None))
|
||||
|
||||
|
||||
_changelog_content = """7780758\x00Break parser\x00 (tag: refs/tags/1_foo.1)
|
||||
04316fe\x00Make python\x00 (refs/heads/review/monty_taylor/27519)
|
||||
|
|
@ -125,6 +126,7 @@ def _make_old_git_changelog_format(line):
|
|||
refname = refname.replace('tag: ', '')
|
||||
return '\x00'.join((sha, msg, refname))
|
||||
|
||||
|
||||
_old_git_changelog_content = '\n'.join(
|
||||
_make_old_git_changelog_format(line)
|
||||
for line in _changelog_content.split('\n'))
|
||||
|
|
@ -162,7 +164,7 @@ class GitLogsTest(base.BaseTestCase):
|
|||
self.assertIn("------", changelog_contents)
|
||||
self.assertIn("Refactor hooks file", changelog_contents)
|
||||
self.assertIn(
|
||||
"Bug fix: create\_stack() fails when waiting",
|
||||
r"Bug fix: create\_stack() fails when waiting",
|
||||
changelog_contents)
|
||||
self.assertNotIn("Refactor hooks file.", changelog_contents)
|
||||
self.assertNotIn("182feb3", changelog_contents)
|
||||
|
|
@ -176,7 +178,7 @@ class GitLogsTest(base.BaseTestCase):
|
|||
self.assertNotIn("ev)il", changelog_contents)
|
||||
self.assertNotIn("e(vi)l", changelog_contents)
|
||||
self.assertNotIn('Merge "', changelog_contents)
|
||||
self.assertNotIn('1\_foo.1', changelog_contents)
|
||||
self.assertNotIn(r'1\_foo.1', changelog_contents)
|
||||
|
||||
def test_generate_authors(self):
|
||||
author_old = u"Foo Foo <email@foo.com>"
|
||||
|
|
@ -216,9 +218,9 @@ class GitLogsTest(base.BaseTestCase):
|
|||
|
||||
with open(os.path.join(self.temp_path, "AUTHORS"), "r") as auth_fh:
|
||||
authors = auth_fh.read()
|
||||
self.assertTrue(author_old in authors)
|
||||
self.assertTrue(author_new in authors)
|
||||
self.assertTrue(co_author in authors)
|
||||
self.assertIn(author_old, authors)
|
||||
self.assertIn(author_new, authors)
|
||||
self.assertIn(co_author, authors)
|
||||
|
||||
|
||||
class _SphinxConfig(object):
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Copyright (c) 2015 Hewlett-Packard Development Company, L.P. (HP)
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
|
|
@ -13,6 +14,7 @@
|
|||
# under the License.
|
||||
|
||||
import io
|
||||
import tempfile
|
||||
import textwrap
|
||||
|
||||
import six
|
||||
|
|
@ -23,6 +25,122 @@ from pbr.tests import base
|
|||
from pbr import util
|
||||
|
||||
|
||||
def config_from_ini(ini):
|
||||
config = {}
|
||||
ini = textwrap.dedent(six.u(ini))
|
||||
if sys.version_info >= (3, 2):
|
||||
parser = configparser.ConfigParser()
|
||||
parser.read_file(io.StringIO(ini))
|
||||
else:
|
||||
parser = configparser.SafeConfigParser()
|
||||
parser.readfp(io.StringIO(ini))
|
||||
for section in parser.sections():
|
||||
config[section] = dict(parser.items(section))
|
||||
return config
|
||||
|
||||
|
||||
class TestBasics(base.BaseTestCase):
|
||||
|
||||
def test_basics(self):
|
||||
self.maxDiff = None
|
||||
config_text = """
|
||||
[metadata]
|
||||
name = foo
|
||||
version = 1.0
|
||||
author = John Doe
|
||||
author_email = jd@example.com
|
||||
maintainer = Jim Burke
|
||||
maintainer_email = jb@example.com
|
||||
home_page = http://example.com
|
||||
summary = A foobar project.
|
||||
description = Hello, world. This is a long description.
|
||||
download_url = http://opendev.org/x/pbr
|
||||
classifier =
|
||||
Development Status :: 5 - Production/Stable
|
||||
Programming Language :: Python
|
||||
platform =
|
||||
any
|
||||
license = Apache 2.0
|
||||
requires_dist =
|
||||
Sphinx
|
||||
requests
|
||||
setup_requires_dist =
|
||||
docutils
|
||||
python_requires = >=3.6
|
||||
provides_dist =
|
||||
bax
|
||||
provides_extras =
|
||||
bar
|
||||
obsoletes_dist =
|
||||
baz
|
||||
|
||||
[files]
|
||||
packages_root = src
|
||||
packages =
|
||||
foo
|
||||
package_data =
|
||||
"" = *.txt, *.rst
|
||||
foo = *.msg
|
||||
namespace_packages =
|
||||
hello
|
||||
data_files =
|
||||
bitmaps =
|
||||
bm/b1.gif
|
||||
bm/b2.gif
|
||||
config =
|
||||
cfg/data.cfg
|
||||
scripts =
|
||||
scripts/hello-world.py
|
||||
modules =
|
||||
mod1
|
||||
"""
|
||||
expected = {
|
||||
'name': u'foo',
|
||||
'version': u'1.0',
|
||||
'author': u'John Doe',
|
||||
'author_email': u'jd@example.com',
|
||||
'maintainer': u'Jim Burke',
|
||||
'maintainer_email': u'jb@example.com',
|
||||
'url': u'http://example.com',
|
||||
'description': u'A foobar project.',
|
||||
'long_description': u'Hello, world. This is a long description.',
|
||||
'download_url': u'http://opendev.org/x/pbr',
|
||||
'classifiers': [
|
||||
u'Development Status :: 5 - Production/Stable',
|
||||
u'Programming Language :: Python',
|
||||
],
|
||||
'platforms': [u'any'],
|
||||
'license': u'Apache 2.0',
|
||||
'install_requires': [
|
||||
u'Sphinx',
|
||||
u'requests',
|
||||
],
|
||||
'setup_requires': [u'docutils'],
|
||||
'python_requires': u'>=3.6',
|
||||
'provides': [u'bax'],
|
||||
'provides_extras': [u'bar'],
|
||||
'obsoletes': [u'baz'],
|
||||
'extras_require': {},
|
||||
|
||||
'package_dir': {'': u'src'},
|
||||
'packages': [u'foo'],
|
||||
'package_data': {
|
||||
'': ['*.txt,', '*.rst'],
|
||||
'foo': ['*.msg'],
|
||||
},
|
||||
'namespace_packages': [u'hello'],
|
||||
'data_files': [
|
||||
('bitmaps', ['bm/b1.gif', 'bm/b2.gif']),
|
||||
('config', ['cfg/data.cfg']),
|
||||
],
|
||||
'scripts': [u'scripts/hello-world.py'],
|
||||
'py_modules': [u'mod1'],
|
||||
}
|
||||
config = config_from_ini(config_text)
|
||||
actual = util.setup_cfg_to_setup_kwargs(config)
|
||||
self.assertDictEqual(expected, actual)
|
||||
|
||||
|
||||
class TestExtrasRequireParsingScenarios(base.BaseTestCase):
|
||||
|
||||
scenarios = [
|
||||
|
|
@ -64,20 +182,8 @@ class TestExtrasRequireParsingScenarios(base.BaseTestCase):
|
|||
{}
|
||||
})]
|
||||
|
||||
def config_from_ini(self, ini):
|
||||
config = {}
|
||||
if sys.version_info >= (3, 2):
|
||||
parser = configparser.ConfigParser()
|
||||
else:
|
||||
parser = configparser.SafeConfigParser()
|
||||
ini = textwrap.dedent(six.u(ini))
|
||||
parser.readfp(io.StringIO(ini))
|
||||
for section in parser.sections():
|
||||
config[section] = dict(parser.items(section))
|
||||
return config
|
||||
|
||||
def test_extras_parsing(self):
|
||||
config = self.config_from_ini(self.config_text)
|
||||
config = config_from_ini(self.config_text)
|
||||
kwargs = util.setup_cfg_to_setup_kwargs(config)
|
||||
|
||||
self.assertEqual(self.expected_extra_requires,
|
||||
|
|
@ -89,3 +195,127 @@ class TestInvalidMarkers(base.BaseTestCase):
|
|||
def test_invalid_marker_raises_error(self):
|
||||
config = {'extras': {'test': "foo :bad_marker>'1.0'"}}
|
||||
self.assertRaises(SyntaxError, util.setup_cfg_to_setup_kwargs, config)
|
||||
|
||||
|
||||
class TestMapFieldsParsingScenarios(base.BaseTestCase):
|
||||
|
||||
scenarios = [
|
||||
('simple_project_urls', {
|
||||
'config_text': """
|
||||
[metadata]
|
||||
project_urls =
|
||||
Bug Tracker = https://bugs.launchpad.net/pbr/
|
||||
Documentation = https://docs.openstack.org/pbr/
|
||||
Source Code = https://opendev.org/openstack/pbr
|
||||
""", # noqa: E501
|
||||
'expected_project_urls': {
|
||||
'Bug Tracker': 'https://bugs.launchpad.net/pbr/',
|
||||
'Documentation': 'https://docs.openstack.org/pbr/',
|
||||
'Source Code': 'https://opendev.org/openstack/pbr',
|
||||
},
|
||||
}),
|
||||
('query_parameters', {
|
||||
'config_text': """
|
||||
[metadata]
|
||||
project_urls =
|
||||
Bug Tracker = https://bugs.launchpad.net/pbr/?query=true
|
||||
Documentation = https://docs.openstack.org/pbr/?foo=bar
|
||||
Source Code = https://git.openstack.org/cgit/openstack-dev/pbr/commit/?id=hash
|
||||
""", # noqa: E501
|
||||
'expected_project_urls': {
|
||||
'Bug Tracker': 'https://bugs.launchpad.net/pbr/?query=true',
|
||||
'Documentation': 'https://docs.openstack.org/pbr/?foo=bar',
|
||||
'Source Code': 'https://git.openstack.org/cgit/openstack-dev/pbr/commit/?id=hash', # noqa: E501
|
||||
},
|
||||
}),
|
||||
]
|
||||
|
||||
def test_project_url_parsing(self):
|
||||
config = config_from_ini(self.config_text)
|
||||
kwargs = util.setup_cfg_to_setup_kwargs(config)
|
||||
|
||||
self.assertEqual(self.expected_project_urls, kwargs['project_urls'])
|
||||
|
||||
|
||||
class TestKeywordsParsingScenarios(base.BaseTestCase):
|
||||
|
||||
scenarios = [
|
||||
('keywords_list', {
|
||||
'config_text': """
|
||||
[metadata]
|
||||
keywords =
|
||||
one
|
||||
two
|
||||
three
|
||||
""", # noqa: E501
|
||||
'expected_keywords': ['one', 'two', 'three'],
|
||||
},
|
||||
),
|
||||
('inline_keywords', {
|
||||
'config_text': """
|
||||
[metadata]
|
||||
keywords = one, two, three
|
||||
""", # noqa: E501
|
||||
'expected_keywords': ['one, two, three'],
|
||||
}),
|
||||
]
|
||||
|
||||
def test_keywords_parsing(self):
|
||||
config = config_from_ini(self.config_text)
|
||||
kwargs = util.setup_cfg_to_setup_kwargs(config)
|
||||
|
||||
self.assertEqual(self.expected_keywords, kwargs['keywords'])
|
||||
|
||||
|
||||
class TestProvidesExtras(base.BaseTestCase):
|
||||
def test_provides_extras(self):
|
||||
ini = """
|
||||
[metadata]
|
||||
provides_extras = foo
|
||||
bar
|
||||
"""
|
||||
config = config_from_ini(ini)
|
||||
kwargs = util.setup_cfg_to_setup_kwargs(config)
|
||||
self.assertEqual(['foo', 'bar'], kwargs['provides_extras'])
|
||||
|
||||
|
||||
class TestDataFilesParsing(base.BaseTestCase):
|
||||
|
||||
scenarios = [
|
||||
('data_files', {
|
||||
'config_text': """
|
||||
[files]
|
||||
data_files =
|
||||
'i like spaces/' =
|
||||
'dir with space/file with spc 2'
|
||||
'dir with space/file with spc 1'
|
||||
""",
|
||||
'data_files': [
|
||||
('i like spaces/', ['dir with space/file with spc 2',
|
||||
'dir with space/file with spc 1'])
|
||||
]
|
||||
})]
|
||||
|
||||
def test_handling_of_whitespace_in_data_files(self):
|
||||
config = config_from_ini(self.config_text)
|
||||
kwargs = util.setup_cfg_to_setup_kwargs(config)
|
||||
|
||||
self.assertEqual(self.data_files, kwargs['data_files'])
|
||||
|
||||
|
||||
class TestUTF8DescriptionFile(base.BaseTestCase):
|
||||
def test_utf8_description_file(self):
|
||||
_, path = tempfile.mkstemp()
|
||||
ini_template = """
|
||||
[metadata]
|
||||
description_file = %s
|
||||
"""
|
||||
# Two \n's because pbr strips the file content and adds \n\n
|
||||
# This way we can use it directly as the assert comparison
|
||||
unicode_description = u'UTF8 description: é"…-ʃŋ\'\n\n'
|
||||
ini = ini_template % path
|
||||
with io.open(path, 'w', encoding='utf8') as f:
|
||||
f.write(unicode_description)
|
||||
config = config_from_ini(ini)
|
||||
kwargs = util.setup_cfg_to_setup_kwargs(config)
|
||||
self.assertEqual(unicode_description, kwargs['long_description'])
|
||||
|
|
|
|||
|
|
@ -77,8 +77,8 @@ class TestWsgiScripts(base.BaseTestCase):
|
|||
|
||||
def _test_wsgi(self, cmd_name, output, extra_args=None):
|
||||
cmd = os.path.join(self.temp_dir, 'bin', cmd_name)
|
||||
print("Running %s -p 0" % cmd)
|
||||
popen_cmd = [cmd, '-p', '0']
|
||||
print("Running %s -p 0 -b 127.0.0.1" % cmd)
|
||||
popen_cmd = [cmd, '-p', '0', '-b', '127.0.0.1']
|
||||
if extra_args:
|
||||
popen_cmd.extend(extra_args)
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ class TestWsgiScripts(base.BaseTestCase):
|
|||
|
||||
stdoutdata = p.stdout.readline() # Available at ...
|
||||
print(stdoutdata)
|
||||
m = re.search(b'(http://[^:]+:\d+)/', stdoutdata)
|
||||
m = re.search(br'(http://[^:]+:\d+)/', stdoutdata)
|
||||
self.assertIsNotNone(m, "Regex failed to match on %s" % stdoutdata)
|
||||
|
||||
stdoutdata = p.stdout.readline() # DANGER! ...
|
||||
|
|
|
|||
|
|
@ -12,17 +12,13 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
sys.path.insert(0, os.path.abspath('../..'))
|
||||
# -- General configuration ----------------------------------------------------
|
||||
|
||||
# Add any Sphinx extension module names here, as strings. They can be
|
||||
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
|
||||
extensions = [
|
||||
'sphinx.ext.autodoc',
|
||||
#'sphinx.ext.intersphinx',
|
||||
]
|
||||
|
||||
# autodoc generation is a bit aggressive and a nuisance when doing heavy
|
||||
|
|
@ -49,17 +45,9 @@ add_module_names = True
|
|||
# The name of the Pygments (syntax highlighting) style to use.
|
||||
pygments_style = 'sphinx'
|
||||
|
||||
|
||||
# -- Options for HTML output --------------------------------------------------
|
||||
|
||||
# The theme to use for HTML and HTML Help pages. Major themes that come with
|
||||
# Sphinx are currently 'default' and 'sphinxdoc'.
|
||||
# html_theme_path = ["."]
|
||||
# html_theme = '_theme'
|
||||
# html_static_path = ['static']
|
||||
|
||||
# Output file base name for HTML help builder.
|
||||
htmlhelp_basename = '%sdoc' % project
|
||||
|
||||
# Grouping the document tree into LaTeX files. List of tuples
|
||||
# (source start file, target name, title, author, documentclass
|
||||
# [howto/manual]).
|
||||
|
|
@ -69,6 +57,3 @@ latex_documents = [
|
|||
u'%s Documentation' % project,
|
||||
u'OpenStack Foundation', 'manual'),
|
||||
]
|
||||
|
||||
# Example configuration for intersphinx: refer to the Python standard library.
|
||||
#intersphinx_mapping = {'http://docs.python.org/': None}
|
||||
|
|
|
|||
|
|
@ -53,9 +53,9 @@ except ImportError:
|
|||
@contextlib.contextmanager
|
||||
def open_config(filename):
|
||||
if sys.version_info >= (3, 2):
|
||||
cfg = configparser.ConfigParser()
|
||||
cfg = configparser.ConfigParser()
|
||||
else:
|
||||
cfg = configparser.SafeConfigParser()
|
||||
cfg = configparser.SafeConfigParser()
|
||||
cfg.read(filename)
|
||||
yield cfg
|
||||
with open(filename, 'w') as fp:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue