From 90bac4e2246d473de80e94a3c3e074a0bbfe1d4e Mon Sep 17 00:00:00 2001 From: Floppa God <93928325+FloppaG@users.noreply.github.com> Date: Tue, 30 Apr 2024 06:03:04 -0700 Subject: [PATCH 1/7] Update solutions.py --- cowsay/tests/solutions.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/cowsay/tests/solutions.py b/cowsay/tests/solutions.py index 372f03d..922cbcd 100644 --- a/cowsay/tests/solutions.py +++ b/cowsay/tests/solutions.py @@ -208,6 +208,25 @@ _.. `--'_..-_/ /--' _ .' ,4 ( i l ),-'' ( l i),' ( ( ! .-' """, + 'kitten': r""" + _________________________________________________ + / \ +| Lorem ipsum dolor sit amet, consetetur sadipscing | +| elitr, sed diamnonumy eirmod tempor invidunt ut | +| labore et dolore magna aliquyam erat,sed diam vol | +| uptua. At vero eos et accusam et justo duo dolore | +| s et ea rebum. | + \ / + ================================================= + \ + \ + \ + \ + /|、 + (゚、 。 7 + | ~ヽ + じしf_,)ノ +""" 'meow': r""" From 03b8964877d08c4b5cdeecbe105535da5d3ed8ba Mon Sep 17 00:00:00 2001 From: Floppa God <93928325+FloppaG@users.noreply.github.com> Date: Tue, 30 Apr 2024 06:06:04 -0700 Subject: [PATCH 2/7] Update characters.py --- cowsay/characters.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cowsay/characters.py b/cowsay/characters.py index 3db9bad..1834d7e 100644 --- a/cowsay/characters.py +++ b/cowsay/characters.py @@ -141,6 +141,16 @@ _.. `--'_..-_/ /--' _ .' ,4 ( i l ),-'' ( l i),' ( ( ! .-' ''', + "kitten": r""" +\ + \ + \ + \ + /|、 + (゚、 。 7 + | ~ヽ + じしf_,)ノ +""", "meow": r""" From 9e46a5781da35bb5c0a51164dec27339034191a9 Mon Sep 17 00:00:00 2001 From: Floppa God <93928325+FloppaG@users.noreply.github.com> Date: Tue, 30 Apr 2024 06:09:12 -0700 Subject: [PATCH 3/7] Update test_api.py --- cowsay/tests/test_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cowsay/tests/test_api.py b/cowsay/tests/test_api.py index 8cdca79..8fd4b0f 100644 --- a/cowsay/tests/test_api.py +++ b/cowsay/tests/test_api.py @@ -6,7 +6,7 @@ def test_char_names(): characters = ['beavis', 'cheese', 'daemon', 'cow', 'dragon', - 'ghostbusters', 'kitty', 'meow', 'milk', 'stegosaurus', + 'ghostbusters', 'kitty', 'kitten', 'meow', 'milk', 'stegosaurus', 'stimpy', 'turkey', 'turtle', 'tux', 'pig', 'trex', 'miki', 'fox', 'octopus'] From ba144e9908fca37201df2018dd274872fb686709 Mon Sep 17 00:00:00 2001 From: Floppa God <93928325+FloppaG@users.noreply.github.com> Date: Tue, 30 Apr 2024 06:19:27 -0700 Subject: [PATCH 4/7] Create python-package-conda.yml --- .github/workflows/python-package-conda.yml | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/python-package-conda.yml diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml new file mode 100644 index 0000000..f358604 --- /dev/null +++ b/.github/workflows/python-package-conda.yml @@ -0,0 +1,34 @@ +name: Python Package using Conda + +on: [push] + +jobs: + build-linux: + runs-on: ubuntu-latest + strategy: + max-parallel: 5 + + steps: + - uses: actions/checkout@v4 + - name: Set up Python 3.10 + uses: actions/setup-python@v3 + with: + python-version: '3.10' + - name: Add conda to system path + run: | + # $CONDA is an environment variable pointing to the root of the miniconda directory + echo $CONDA/bin >> $GITHUB_PATH + - name: Install dependencies + run: | + conda env update --file environment.yml --name base + - name: Lint with flake8 + run: | + conda install flake8 + # stop the build if there are Python syntax errors or undefined names + flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + - name: Test with pytest + run: | + conda install pytest + pytest From a72b82f8c8d9b8d7dd99b479618f9f38c5d40911 Mon Sep 17 00:00:00 2001 From: Floppa God <93928325+FloppaG@users.noreply.github.com> Date: Tue, 30 Apr 2024 06:25:04 -0700 Subject: [PATCH 5/7] Delete .github/workflows/python-package-conda.yml --- .github/workflows/python-package-conda.yml | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 .github/workflows/python-package-conda.yml diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml deleted file mode 100644 index f358604..0000000 --- a/.github/workflows/python-package-conda.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Python Package using Conda - -on: [push] - -jobs: - build-linux: - runs-on: ubuntu-latest - strategy: - max-parallel: 5 - - steps: - - uses: actions/checkout@v4 - - name: Set up Python 3.10 - uses: actions/setup-python@v3 - with: - python-version: '3.10' - - name: Add conda to system path - run: | - # $CONDA is an environment variable pointing to the root of the miniconda directory - echo $CONDA/bin >> $GITHUB_PATH - - name: Install dependencies - run: | - conda env update --file environment.yml --name base - - name: Lint with flake8 - run: | - conda install flake8 - # stop the build if there are Python syntax errors or undefined names - flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics - # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - - name: Test with pytest - run: | - conda install pytest - pytest From a0b0348082beba488d7d5d30995e36e49617209c Mon Sep 17 00:00:00 2001 From: Floppa God <93928325+FloppaG@users.noreply.github.com> Date: Tue, 30 Apr 2024 06:36:16 -0700 Subject: [PATCH 6/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e54742..60baee9 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ $ cowsay -t "Hello World" -c "tux" # More Characters ```pycon >>> cowsay.char_names -['beavis', 'cheese', 'cow', 'daemon', 'dragon', 'fox', 'ghostbusters', 'kitty', +['beavis', 'cheese', 'cow', 'daemon', 'dragon', 'fox', 'ghostbusters', 'kitty', 'kitten', 'meow', 'miki', 'milk', 'octopus', 'pig', 'stegosaurus', 'stimpy', 'trex', 'turkey', 'turtle', 'tux'] From 0557447a96072e418ddb09a0a826401bb7118e72 Mon Sep 17 00:00:00 2001 From: Floppa God <93928325+FloppaG@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:02:08 -0700 Subject: [PATCH 7/7] Fix cat --- cowsay/characters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cowsay/characters.py b/cowsay/characters.py index 1834d7e..9725682 100644 --- a/cowsay/characters.py +++ b/cowsay/characters.py @@ -141,7 +141,7 @@ _.. `--'_..-_/ /--' _ .' ,4 ( i l ),-'' ( l i),' ( ( ! .-' ''', - "kitten": r""" + "kitten": r''' \ \ \ @@ -150,7 +150,7 @@ (゚、 。 7 | ~ヽ じしf_,)ノ -""", +''', "meow": r"""