From c7109ac32a2603cf2f3cf4334166fd92b9e6fd67 Mon Sep 17 00:00:00 2001 From: Razvan Dobre Date: Mon, 28 Jul 2025 15:51:30 +0300 Subject: [PATCH 1/7] Fix Python dependencies in docker image --- Dockerfile | 2 +- requirements.txt | 1 + setup.py | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 requirements.txt diff --git a/Dockerfile b/Dockerfile index 1598d585..3989572c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,5 +6,5 @@ ADD . /config-merger/ RUN apt-get update && apt-get install -y make curl -RUN python -m pip install --upgrade pip && pip3 install . +RUN python -m pip install --upgrade pip && pip3 install -r requirements.txt && pip3 install . RUN rm -rf /config-merger/* diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..ddb2c72d --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +setuptools~=78.1.1 diff --git a/setup.py b/setup.py index 9957ba58..c58cab7c 100644 --- a/setup.py +++ b/setup.py @@ -13,8 +13,7 @@ 'pyyaml~=6.0.2', 'pathlib2~=2.3.7', 'boto3~=1.39.14', - 'hvac~=2.3.0', - 'setuptools~=44.0.0' + 'hvac~=2.3.0' ] setup( From 25a8135a23a54066844837a7faf4210c9c21cf7e Mon Sep 17 00:00:00 2001 From: Razvan Dobre Date: Mon, 28 Jul 2025 16:16:37 +0300 Subject: [PATCH 2/7] Fix build --- .github/workflows/publish-to-pypi.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 6f61b9d1..b8bca006 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -7,12 +7,12 @@ jobs: name: Build and publish Python distributions to PyPI runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@main - - name: Set up Python 3.10 + - name: Set up Python 3.13 uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.13' - name: Install dependencies run: | @@ -30,6 +30,6 @@ jobs: - name: Publish distribution to PyPI if: startsWith(github.ref, 'refs/tags') - uses: pypa/gh-action-pypi-publish@master + uses: pypa/gh-action-pypi-publish@main with: password: ${{ secrets.ADOBE_BOT_PYPI_TOKEN }} From eb11f45fb7491b4bb68caaec699dfe85edfb16f2 Mon Sep 17 00:00:00 2001 From: Razvan Dobre Date: Mon, 28 Jul 2025 16:19:54 +0300 Subject: [PATCH 3/7] Patch --- .github/workflows/publish-to-pypi.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index b8bca006..aa14de08 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -7,12 +7,14 @@ jobs: name: Build and publish Python distributions to PyPI runs-on: ubuntu-latest steps: - - uses: actions/checkout@main + - uses: actions/checkout@master + with: + ref: main - - name: Set up Python 3.13 + - name: Set up Python 3.10 uses: actions/setup-python@v5 with: - python-version: '3.13' + python-version: '3.10' - name: Install dependencies run: | @@ -30,6 +32,6 @@ jobs: - name: Publish distribution to PyPI if: startsWith(github.ref, 'refs/tags') - uses: pypa/gh-action-pypi-publish@main + uses: pypa/gh-action-pypi-publish@master with: password: ${{ secrets.ADOBE_BOT_PYPI_TOKEN }} From ac86502591f1c0f830a8628d871f7bcf5fee83d5 Mon Sep 17 00:00:00 2001 From: Razvan Dobre Date: Mon, 28 Jul 2025 16:20:59 +0300 Subject: [PATCH 4/7] Patch --- .github/workflows/publish-to-pypi.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index aa14de08..29005f48 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -11,10 +11,10 @@ jobs: with: ref: main - - name: Set up Python 3.10 + - name: Set up Python 3.13 uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.13' - name: Install dependencies run: | From 6dd5cb960878e718489e5ac485ca2f3eb440654a Mon Sep 17 00:00:00 2001 From: Razvan Dobre Date: Mon, 28 Jul 2025 16:22:29 +0300 Subject: [PATCH 5/7] Patch --- .github/workflows/publish-to-pypi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 29005f48..691e7c9b 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -19,6 +19,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + pip install -r requirements.txt - name: Run tests run: | From 6476eebe91a3c970add1158b18bf04ca05edffe3 Mon Sep 17 00:00:00 2001 From: Razvan Dobre Date: Mon, 28 Jul 2025 16:23:51 +0300 Subject: [PATCH 6/7] Patch --- .github/workflows/publish-to-pypi.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 691e7c9b..c5364eb0 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -19,7 +19,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r requirements.txt - name: Run tests run: | @@ -28,7 +27,7 @@ jobs: - name: Build a binary wheel and a source tarball run: | - pip install wheel + pip install wheel setuptools python setup.py sdist bdist_wheel - name: Publish distribution to PyPI From f9028e06021fc1c7e8313c29c560c26a913a5981 Mon Sep 17 00:00:00 2001 From: Razvan Dobre Date: Mon, 28 Jul 2025 16:27:09 +0300 Subject: [PATCH 7/7] Patch --- .bumpversion.cfg | 2 +- README.md | 2 +- himl/main.py | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 4a196111..452afee6 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.16.3 +current_version = 0.16.4 commit = True tag = True tag_name = {new_version} diff --git a/README.md b/README.md index fb8055dc..9b91facf 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # himl A hierarchical config using yaml in Python. -Latest version is: 0.16.3 +Latest version is: 0.16.4 ## Description diff --git a/himl/main.py b/himl/main.py index b07f6569..c32f5c77 100644 --- a/himl/main.py +++ b/himl/main.py @@ -76,7 +76,7 @@ def get_parser(parser=None): parser.add_argument('--list-merge-strategy', dest='merge_list_strategy', type=ListMergeStrategy, choices=list(ListMergeStrategy), default='append', help='override default merge strategy for list') - parser.add_argument('--version', action='version', version='%(prog)s v{version}'.format(version="0.16.3"), + parser.add_argument('--version', action='version', version='%(prog)s v{version}'.format(version="0.16.4"), help='print himl version') return parser diff --git a/setup.py b/setup.py index c58cab7c..4727e14f 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name='himl', - version="0.16.3", + version="0.16.4", description='A hierarchical config using yaml', long_description=_readme + '\n\n', long_description_content_type='text/markdown',