Merge pull request #182 from adobe/himl_0.16.4

Fix Python dependencies in docker image

Author: dobrerazvan

.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}

.github/workflows/publish-to-pypi.yml

@@ -8,11 +8,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
+      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: |
@@ -25,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

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/*

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
 

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
 

requirements.txt

@@ -0,0 +1 @@
+setuptools~=78.1.1

setup.py

@@ -13,13 +13,12 @@
     '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(
     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',