Skip to content

Commit 03ef3aa

Browse files
author
David Newswanger
committed
Merge remote-tracking branch 'upstream/master' into stable-4.3
2 parents d6c9bf7 + 69aa9cf commit 03ef3aa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+150
-117
lines changed

.travis/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.3.0.dev
1+
4.3.0a2

CHANGES.rst

Lines changed: 140 additions & 0 deletions

CHANGES/120.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/132.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/139.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/145.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/152.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/16.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/166.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/176.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/177.misc

Whitespace-only changes.

CHANGES/185.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/195.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/203.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/205.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/220.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/222.bugfix

Lines changed: 0 additions & 5 deletions
This file was deleted.

CHANGES/224.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/257.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/265.bufix

Lines changed: 0 additions & 3 deletions
This file was deleted.

CHANGES/266.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/272.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/274.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/276.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/277.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/278.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/281.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/282.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/291.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/295.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/298.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/299.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/31.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/317.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/338.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/344.misc

Lines changed: 0 additions & 8 deletions
This file was deleted.

CHANGES/387.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/393.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/409.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/425.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/432.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/433.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/44.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/453.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/478.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/482.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/483.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/486.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/50.bugfix

Lines changed: 0 additions & 3 deletions
This file was deleted.

CHANGES/500.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGES/57.feature

Lines changed: 0 additions & 45 deletions
This file was deleted.

galaxy_ng/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
__version__ = "4.3.0.dev"
1+
__version__ = "4.3.0a2"
22

33
default_app_config = "galaxy_ng.app.PulpGalaxyPluginAppConfig"

galaxy_ng/app/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class PulpGalaxyPluginAppConfig(PulpPluginAppConfig):
88

99
name = "galaxy_ng.app"
1010
label = "galaxy"
11-
version = "4.3.0.dev"
11+
version = "4.3.0a2"
1212

1313
def ready(self):
1414
super().ready()

setup.cfg

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[bumpversion]
2-
current_version = 4.3.0.dev
2+
current_version = 4.3.0a2
33
commit = False
44
tag = False
5-
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?((?P<build>\d+))?
6-
serialize =
7-
{major}.{minor}.{patch}.{release}{build}
8-
{major}.{minor}.{patch}.{release}
5+
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+))?((?P<build>\d+))?
6+
serialize =
7+
{major}.{minor}.{patch}{release}{build}
8+
{major}.{minor}.{patch}{release}
99
{major}.{minor}.{patch}
1010

1111
[bumpversion:part:release]
1212
optional_value = stable
1313
first_value = stable
14-
values =
14+
values =
1515
stable
1616
dev
1717
a

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def run(self):
9090
print("Installing with unpinned DEV_SOURCE_PATH requirements", requirements)
9191

9292
package_name = os.environ.get("GALAXY_NG_ALTERNATE_NAME", "galaxy-ng")
93-
version = "4.3.0.dev"
93+
version = "4.3.0a2"
9494

9595
setup(
9696
name=package_name,

0 commit comments

Comments
 (0)