Skip to content

Commit

Permalink
Add workaround for failing pyyaml builds
Browse files Browse the repository at this point in the history
  • Loading branch information
TylerZeroMaster committed Jul 17, 2023
1 parent 8d8b6c4 commit 7b4f547
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
8 changes: 7 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,13 @@ RUN set -x \
# Install dependencies
COPY ./nebuchadnezzar/requirements /workspace/enki/nebuchadnezzar/requirements
COPY ./bakery-src/scripts/requirements.txt /workspace/enki/bakery-src/scripts/
RUN pip3 install -r /workspace/enki/nebuchadnezzar/requirements/main.txt -r /workspace/enki/bakery-src/scripts/requirements.txt

# More details: https://github.com/aws/aws-cli/issues/8036#issuecomment-1638544754
# and: https://github.com/yaml/pyyaml/issues/601
# PyYAML installed as dependency here [awscli](https://github.com/aws/aws-cli/blob/dbbf1ce01acec0116710968bbe5a96680e791c1b/setup.py#L30)
RUN pip3 install "PyYAML==5.3.1" \
-r /workspace/enki/nebuchadnezzar/requirements/main.txt \
-r /workspace/enki/bakery-src/scripts/requirements.txt

# Install scripts
COPY ./nebuchadnezzar/ /workspace/enki/nebuchadnezzar/
Expand Down
6 changes: 5 additions & 1 deletion test/test-step-10.bash
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ if [[ $CI = '' && $VIRTUAL_ENV = '' ]]; then
exit 1
fi

pip install "../bakery-src/scripts/.[test]"

# More details: https://github.com/aws/aws-cli/issues/8036#issuecomment-1638544754
# and: https://github.com/yaml/pyyaml/issues/601
# PyYAML installed as dependency here [awscli](https://github.com/aws/aws-cli/blob/dbbf1ce01acec0116710968bbe5a96680e791c1b/setup.py#L30)
pip install "PyYAML==5.3.1" "../bakery-src/scripts/.[test]"
flake8 "../bakery-src/scripts" --max-line-length=110

pytest --asyncio-mode=strict --cov=bakery_scripts --cov-append --cov-report=xml:cov.xml --cov-report=html:cov.html --cov-report=term-missing ../bakery-src -vvv
Expand Down

0 comments on commit 7b4f547

Please sign in to comment.