summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Mueller <30130371+cdce8p@users.noreply.github.com>2023-04-25 14:13:50 +0200
committerGitHub <noreply@github.com>2023-04-25 14:13:50 +0200
commit306e8fb11a2069b01caa91f0c51dcd16eb09f981 (patch)
tree50d47f89ba73af48874b146ba6d61878f8ab7fee
parentf13b247d617de36f44d7e825566f134174723c28 (diff)
parent9483df19598343fd98e88f5504424f8981ed1a87 (diff)
downloadastroid-git-306e8fb11a2069b01caa91f0c51dcd16eb09f981.tar.gz
Merge pull request #2151 from pylint-dev/release-3.0.0a1
Release 3.0.0a1
-rw-r--r--CONTRIBUTORS.txt3
-rw-r--r--astroid/__pkginfo__.py2
-rw-r--r--script/.contributors_aliases.json7
-rw-r--r--script/bump_changelog.py2
-rw-r--r--tbump.toml2
5 files changed, 12 insertions, 4 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 685f8a0b..3d6ea1fc 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -40,7 +40,7 @@ Contributors
- David Gilman <davidgilman1@gmail.com>
- Julien Jehannet <julien.jehannet@logilab.fr>
- Calen Pennington <calen.pennington@gmail.com>
-- Tushar Sadhwani <86737547+tushar-deepsource@users.noreply.github.com>
+- Tushar Sadhwani <tushar.sadhwani000@gmail.com> <86737547+tushar-deepsource@users.noreply.github.com>
- Hugo van Kemenade <hugovk@users.noreply.github.com>
- Tim Martin <tim@asymptotic.co.uk>
- Phil Schaf <flying-sheep@web.de>
@@ -186,6 +186,7 @@ Contributors
- Alexander Scheel <alexander.m.scheel@gmail.com>
- Alexander Presnyakov <flagist0@gmail.com>
- Ahmed Azzaoui <ahmed.azzaoui@engie.com>
+- alm <alonme@users.noreply.github.com
Co-Author
---------
diff --git a/astroid/__pkginfo__.py b/astroid/__pkginfo__.py
index c8bc8f5f..62c66e29 100644
--- a/astroid/__pkginfo__.py
+++ b/astroid/__pkginfo__.py
@@ -2,5 +2,5 @@
# For details: https://github.com/pylint-dev/astroid/blob/main/LICENSE
# Copyright (c) https://github.com/pylint-dev/astroid/blob/main/CONTRIBUTORS.txt
-__version__ = "2.16.0dev0"
+__version__ = "3.0.0a2-dev0"
version = __version__
diff --git a/script/.contributors_aliases.json b/script/.contributors_aliases.json
index 0953885e..fedcc682 100644
--- a/script/.contributors_aliases.json
+++ b/script/.contributors_aliases.json
@@ -165,6 +165,13 @@
"name": "Sylvain Thénault",
"team": "Ex-maintainers"
},
+ "tushar.sadhwani000@gmail.com": {
+ "mails": [
+ "tushar.sadhwani000@gmail.com",
+ "86737547+tushar-deepsource@users.noreply.github.com"
+ ],
+ "name": "Tushar Sadhwani"
+ },
"ville.skytta@iki.fi": {
"mails": ["ville.skytta@iki.fi", "ville.skytta@upcloud.com"],
"name": "Ville Skyttä"
diff --git a/script/bump_changelog.py b/script/bump_changelog.py
index bfd73792..a08a1aef 100644
--- a/script/bump_changelog.py
+++ b/script/bump_changelog.py
@@ -34,7 +34,7 @@ def main() -> None:
if args.verbose:
logging.basicConfig(level=logging.DEBUG)
logging.debug(f"Launching bump_changelog with args: {args}")
- if "dev" in args.version:
+ if any(s in args.version for s in ("dev", "a", "b")):
return
with open(DEFAULT_CHANGELOG_PATH, encoding="utf-8") as f:
content = f.read()
diff --git a/tbump.toml b/tbump.toml
index 258aa635..ed881458 100644
--- a/tbump.toml
+++ b/tbump.toml
@@ -1,7 +1,7 @@
github_url = "https://github.com/pylint-dev/astroid"
[version]
-current = "2.16.0dev0"
+current = "3.0.0a2-dev0"
regex = '''
^(?P<major>0|[1-9]\d*)
\.