Skip to content

Commit

Permalink
Updated author email in configuration and tests
Browse files Browse the repository at this point in the history
Per https://groups.google.com/d/msg/pypa-dev/rUNsfIbruHM/LCEx-CB5AgAJ
the pypa-dev Google Group is now decommissioned.
Using distutils-sig instead as author/maintainer email.

Signed-off-by: Sumana Harihareswara <[email protected]>
  • Loading branch information
brainwane committed May 28, 2020
1 parent 1e67c3c commit a9108c7
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/jobs/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
versionSpec: '3'

- bash: |
git config --global user.email "[email protected]"
git config --global user.email "[email protected]"
git config --global user.name "pip"
displayName: Setup Git credentials
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def get_version(rel_path):
},

author='The pip developers',
author_email='[email protected]',
author_email='[email protected]',

package_dir={"": "src"},
packages=find_packages(
Expand Down
4 changes: 2 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"] = "[email protected]"
os.environ["GIT_AUTHOR_EMAIL"] = "[email protected]"

# We want to disable the version check from running in the tests
os.environ["PIP_DISABLE_PIP_VERSION_CHECK"] = "true"
Expand All @@ -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 = [email protected]\n"
b"[user]\n\tname = pip\n\temail = [email protected]\n"
)


Expand Down
2 changes: 1 addition & 1 deletion tests/data/src/sample/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def find_version(*file_paths):

# Author details
author='The Python Packaging Authority',
author_email='[email protected]',
author_email='[email protected]',

# Choose your license
license='MIT',
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/test_vcs_bazaar.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>',
'--author', 'pip <[email protected]>',
'-m', 'change test file', cwd=source_dir,
)

Expand Down
8 changes: 4 additions & 4 deletions tests/lib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ def _git_commit(
args.append("--all")

new_args = [
'git', 'commit', '-q', '--author', 'pip <[email protected]>',
'git', 'commit', '-q', '--author', 'pip <[email protected]>',
]
new_args.extend(args)
new_args.extend(['-m', message])
Expand All @@ -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 <[email protected]>',
'--user', 'pip <[email protected]>',
'-m', 'initial version', cwd=version_pkg_path,
)
elif vcs == 'svn':
Expand All @@ -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 <[email protected]>',
'bzr', 'whoami', 'pip <[email protected]>',
cwd=version_pkg_path)
script.run(
'bzr', 'commit', '-q',
'--author', 'pip <[email protected]>',
'--author', 'pip <[email protected]>',
'-m', 'initial version', cwd=version_pkg_path,
)
else:
Expand Down
2 changes: 1 addition & 1 deletion tools/travis/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
set -e

echo "Setting Git Credentials..."
git config --global user.email "[email protected]"
git config --global user.email "[email protected]"
git config --global user.name "pip"

0 comments on commit a9108c7

Please sign in to comment.