Skip to content

Commit 96e6e3b

Browse files
Merge branch 'develop'
2 parents 0e01790 + b8836a9 commit 96e6e3b

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
pull_request:
55
branches:
66
- develop
7+
- "feat*"
78
merge_group:
89
types: [checks_requested]
910
branches:
1011
- develop
12+
- "feat*"
1113

1214
jobs:
1315
run-workflow:

.github/workflows/pr-labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
github-token: ${{secrets.GITHUB_TOKEN}}
2323
script: |
24-
const maintainers = ['jfuss', 'hoffa', 'awood45', 'aahung', 'hawflau', 'mndeveci', 'ssenchenko', 'qingchm', 'moelasmar', 'xazhao', 'mildaniel', 'marekaiv', 'torresxb1', 'lucashuy', 'hnnasit', 'sriram-mv']
24+
const maintainers = ['jfuss', 'hoffa', 'awood45', 'aahung', 'hawflau', 'mndeveci', 'ssenchenko', 'qingchm', 'moelasmar', 'xazhao', 'mildaniel', 'marekaiv', 'torresxb1', 'lucashuy', 'hnnasit', 'sriram-mv', 'dependabot[bot]']
2525
if (maintainers.includes(context.payload.sender.login)) {
2626
github.rest.issues.addLabels({
2727
issue_number: context.issue.number,

aws_lambda_builders/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44

55
# Changing version will trigger a new release!
66
# Please make the version change as the last step of your development.
7-
__version__ = "1.28.0"
7+
__version__ = "1.29.0"
88
RPC_PROTOCOL_VERSION = "0.3"

requirements/dev.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
coverage==7.2.2
1+
coverage==7.2.3
22
flake8==3.3.0; python_version < '3.8'
33
flake8==3.8.4; python_version >= '3.8'
44
pytest-cov==4.0.0
@@ -7,9 +7,9 @@ isort>=4.2.5,<5; python_version < '3.8'
77

88
# Test requirements
99
pytest>=6.1.1
10-
parameterized==0.8.1
10+
parameterized==0.9.0
1111
pyelftools~=0.29 # Used to verify the generated Go binary architecture in integration tests (utils.py)
1212

1313
# formatter
14-
black==23.1.0
15-
ruff==0.0.257
14+
black==23.3.0
15+
ruff==0.0.261

tests/functional/workflows/python_pip/test_packager.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -902,14 +902,14 @@ def test_setup_tar_gz_hyphens_in_name(self, osutils, sdist_reader):
902902
# The whole reason we need to use the egg info to get the name and
903903
# version is that we cannot deterministically parse that information
904904
# from the filenames themselves. This test puts hyphens in the name
905-
# and version which would break a simple ``split("-")`` attempt to get
906-
# that information.
907-
setup_py = self._SETUP_PY % (self._SETUPTOOLS, "foo-bar", "1.0-2b")
905+
# which would break a simple ``split("-")`` attempt to get that
906+
# information.
907+
setup_py = self._SETUP_PY % (self._SETUPTOOLS, "foo-bar", "1.2b2")
908908
with osutils.tempdir() as tempdir:
909909
filepath = self._write_fake_sdist(setup_py, tempdir, "tar.gz")
910910
name, version = sdist_reader.get_package_name_and_version(filepath)
911911
assert name == "foo-bar"
912-
assert version == "1.0-2b"
912+
assert version == "1.2b2"
913913

914914
def test_setup_zip(self, osutils, sdist_reader):
915915
setup_py = self._SETUP_PY % (self._SETUPTOOLS, "foo", "1.0")
@@ -944,20 +944,20 @@ def test_distutil_zip(self, osutils, sdist_reader):
944944
assert version == "1.0"
945945

946946
def test_both_tar_gz(self, osutils, sdist_reader):
947-
setup_py = self._SETUP_PY % (self._BOTH, "foo-bar", "1.0-2b")
947+
setup_py = self._SETUP_PY % (self._BOTH, "foo-bar", "1.0b2")
948948
with osutils.tempdir() as tempdir:
949949
filepath = self._write_fake_sdist(setup_py, tempdir, "tar.gz")
950950
name, version = sdist_reader.get_package_name_and_version(filepath)
951951
assert name == "foo-bar"
952-
assert version == "1.0-2b"
952+
assert version == "1.0b2"
953953

954954
def test_both_tar_bz2(self, osutils, sdist_reader):
955-
setup_py = self._SETUP_PY % (self._BOTH, "foo-bar", "1.0-2b")
955+
setup_py = self._SETUP_PY % (self._BOTH, "foo-bar", "1.0b2")
956956
with osutils.tempdir() as tempdir:
957957
filepath = self._write_fake_sdist(setup_py, tempdir, "tar.bz2")
958958
name, version = sdist_reader.get_package_name_and_version(filepath)
959959
assert name == "foo-bar"
960-
assert version == "1.0-2b"
960+
assert version == "1.0b2"
961961

962962
def test_both_zip(self, osutils, sdist_reader):
963963
setup_py = self._SETUP_PY % (self._BOTH, "foo", "1.0")

0 commit comments

Comments
 (0)