diff --git a/.azure-pipelines/jobs/package.yml b/.azure-pipelines/jobs/package.yml index 8663720de..bdb0254a1 100644 --- a/.azure-pipelines/jobs/package.yml +++ b/.azure-pipelines/jobs/package.yml @@ -16,7 +16,7 @@ jobs: versionSpec: '3' - bash: | - git config --global user.email "pypa-dev@googlegroups.com" + git config --global user.email "distutils-sig@python.org" git config --global user.name "pip" displayName: Setup Git credentials diff --git a/news/8454.bugfix b/news/8454.bugfix new file mode 100644 index 000000000..fe799f934 --- /dev/null +++ b/news/8454.bugfix @@ -0,0 +1 @@ +Update author email in config and tests to reflect decommissioning of pypa-dev list. diff --git a/setup.py b/setup.py index 2fdb4c504..f731b61e8 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,7 @@ setup( }, author='The pip developers', - author_email='pypa-dev@groups.google.com', + author_email='distutils-sig@python.org', package_dir={"": "src"}, packages=find_packages( diff --git a/tests/conftest.py b/tests/conftest.py index c5f369cb8..d57c66896 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -206,7 +206,7 @@ def isolate(tmpdir): # and cause test failures. os.environ["GIT_CONFIG_NOSYSTEM"] = "1" os.environ["GIT_AUTHOR_NAME"] = "pip" - os.environ["GIT_AUTHOR_EMAIL"] = "pypa-dev@googlegroups.com" + os.environ["GIT_AUTHOR_EMAIL"] = "distutils-sig@python.org" # We want to disable the version check from running in the tests os.environ["PIP_DISABLE_PIP_VERSION_CHECK"] = "true" @@ -218,7 +218,7 @@ def isolate(tmpdir): os.makedirs(os.path.join(home_dir, ".config", "git")) with open(os.path.join(home_dir, ".config", "git", "config"), "wb") as fp: fp.write( - b"[user]\n\tname = pip\n\temail = pypa-dev@googlegroups.com\n" + b"[user]\n\tname = pip\n\temail = distutils-sig@python.org\n" ) diff --git a/tests/data/src/sample/setup.py b/tests/data/src/sample/setup.py index d5a6e1b53..875860cb7 100644 --- a/tests/data/src/sample/setup.py +++ b/tests/data/src/sample/setup.py @@ -39,7 +39,7 @@ setup( # Author details author='The Python Packaging Authority', - author_email='pypa-dev@googlegroups.com', + author_email='distutils-sig@python.org', # Choose your license license='MIT', diff --git a/tests/functional/test_vcs_bazaar.py b/tests/functional/test_vcs_bazaar.py index af52daa63..d928da8b3 100644 --- a/tests/functional/test_vcs_bazaar.py +++ b/tests/functional/test_vcs_bazaar.py @@ -55,7 +55,7 @@ def test_export_rev(script, tmpdir): create_file(source_dir / 'test_file', 'something new') script.run( 'bzr', 'commit', '-q', - '--author', 'pip ', + '--author', 'pip ', '-m', 'change test file', cwd=source_dir, ) diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py index d08e1f361..6f7a43dad 100644 --- a/tests/lib/__init__.py +++ b/tests/lib/__init__.py @@ -782,7 +782,7 @@ def _git_commit( args.append("--all") new_args = [ - 'git', 'commit', '-q', '--author', 'pip ', + 'git', 'commit', '-q', '--author', 'pip ', ] new_args.extend(args) new_args.extend(['-m', message]) @@ -799,7 +799,7 @@ def _vcs_add(script, version_pkg_path, vcs='git'): script.run('hg', 'add', '.', cwd=version_pkg_path) script.run( 'hg', 'commit', '-q', - '--user', 'pip ', + '--user', 'pip ', '-m', 'initial version', cwd=version_pkg_path, ) elif vcs == 'svn': @@ -818,11 +818,11 @@ def _vcs_add(script, version_pkg_path, vcs='git'): script.run('bzr', 'init', cwd=version_pkg_path) script.run('bzr', 'add', '.', cwd=version_pkg_path) script.run( - 'bzr', 'whoami', 'pip ', + 'bzr', 'whoami', 'pip ', cwd=version_pkg_path) script.run( 'bzr', 'commit', '-q', - '--author', 'pip ', + '--author', 'pip ', '-m', 'initial version', cwd=version_pkg_path, ) else: diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh index d4676e2fb..c52ce5f16 100755 --- a/tools/travis/setup.sh +++ b/tools/travis/setup.sh @@ -2,5 +2,5 @@ set -e echo "Setting Git Credentials..." -git config --global user.email "pypa-dev@googlegroups.com" +git config --global user.email "distutils-sig@python.org" git config --global user.name "pip"