diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index db080d5..304887a 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -17,7 +17,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r requirements.txt - name: Run tests run: | diff --git a/Dockerfile b/Dockerfile index b8f9eae..0136585 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,5 @@ ADD . /config-merger/ RUN apt-get update && apt-get install -y make curl -RUN python -m pip install --upgrade pip && pip3 install -r requirements.txt -RUN pip3 install . +RUN python -m pip install --upgrade pip && pip3 install .[extras] RUN rm -rf /config-merger/* diff --git a/MANIFEST.in b/MANIFEST.in index 997cdc6..e24d9d0 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,2 @@ include README.md -include requirements.txt recursive-include examples * diff --git a/README.md b/README.md index eb23e66..2825651 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,8 @@ Idea came from puppet's hiera. ```sh pip install himl +# or, optionally install with extras dependencies: vault and aws interpolation support +pip install himl[extras] ``` ### Using `docker` image @@ -57,7 +59,7 @@ See all docker tags at: https://github.com/adobe/himl/pkgs/container/himl/versio ``` git clone https://github.com/adobe/himl cd himl -sudo python setup.py install +sudo python install -e .[extras] ``` ## Examples diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 8bbc1a6..0000000 --- a/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -deepmerge==1.0.1 -lru_cache==0.2.3 -backports.functools_lru_cache==1.6.4 -pathlib2==2.3.7.post1 -boto3==1.22.12 -pyyaml==6.0 -hvac==0.11.2 diff --git a/setup.py b/setup.py index a786b3b..de10e34 100644 --- a/setup.py +++ b/setup.py @@ -9,9 +9,6 @@ with open('README.md', encoding="utf-8") as f: _readme = f.read() -_mydir = os.path.abspath(os.path.dirname(sys.argv[0])) -_requires = [ r for r in open(os.path.sep.join((_mydir,'requirements.txt')), "r").read().split('\n') if len(r)>1 ] - setup( name='himl', version="0.9.0", @@ -46,7 +43,19 @@ ], packages=['himl'], include_package_data=True, - install_requires=_requires, + install_requires=[ + 'deepmerge==1.0.1', + 'lru_cache==0.2.3', + 'backports.functools_lru_cache==1.6.4', + 'pathlib2==2.3.7.post1', + 'pyyaml==6.0' + ], + extras_require={ + 'extras': [ + 'boto3==1.22.12', + 'hvac==0.11.2' + ] + }, entry_points={ 'console_scripts': [ 'himl = himl.main:run',