diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml new file mode 100644 index 0000000..95368a5 --- /dev/null +++ b/.github/workflows/python-app.yml @@ -0,0 +1,58 @@ +# This workflow will install Python dependencies, run tests and lint with a single version of Python +# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions + +name: Python application + +on: + push: + branches: [ main, develop ] + pull_request: + branches: [ main ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.10 + uses: actions/setup-python@v2 + with: + python-version: "3.10" + - name: PyInstaller Linux + # You may pin to the exact commit or the version. + # uses: JackMcKew/pyinstaller-action-linux@38639c352a36917eea765f9283bfd1092c28af7b + uses: JackMcKew/pyinstaller-action-linux@0.1.4 + with: + # Directory containing source code & .spec file (optional requirements.txt). + path: src + # Specify a custom URL for PYPI + pypi_url: https://pypi.python.org/ + # Specify a custom URL for PYPI Index + pypi_index_url: https://pypi.python.org/simple + # Specify a file path for .spec file + spec: pydle.spec + # Specify whether to install Tkinter or not + tkinter: false + - name: PyInstaller Windows + # You may pin to the exact commit or the version. + # uses: JackMcKew/pyinstaller-action-windows@a8dee21ad01bbc7e7363d445bb632691b95ba057 + uses: JackMcKew/pyinstaller-action-windows@v0.1.2 + with: + # Directory containing source code (optional requirements.txt). + path: src + # Specify a custom URL for PYPI + pypi_url: https://pypi.python.org/ + # Specify a custom URL for PYPI Index + pypi_index_url: https://pypi.python.org/simple + # Specify a file path for .spec file + spec: pydle.spec + - uses: actions/upload-artifact@v2 + with: + name: pydleWindows + path: src/dist/windows + - uses: actions/upload-artifact@v2 + with: + name: pydleUnix + path: src/dist/linux diff --git a/main.py b/src/pydle.py similarity index 93% rename from main.py rename to src/pydle.py index 823cad3..5c282ed 100644 --- a/main.py +++ b/src/pydle.py @@ -67,8 +67,9 @@ while counter < 6: if checkRight(wordToGuess, emptyWordGuess): print("Congratulations! The word was", ''.join(wordToGuess).capitalize()) exit(420) - print("Incorrect letters: " + str(wrongLetters)) - print("Correct letters in the wrong place: " + str(rightLettersWrongPlace)) + print("Incorrect letters: " + ', '.join(wrongLetters)) + + print("Correct letters in the wrong place: " + ', '.join(rightLettersWrongPlace)) print("Result: " + " ".join(emptyWordGuess)) counter += 1 diff --git a/src/pydle.spec b/src/pydle.spec new file mode 100644 index 0000000..9e77367 --- /dev/null +++ b/src/pydle.spec @@ -0,0 +1,39 @@ +# -*- mode: python ; coding: utf-8 -*- + + +block_cipher = None + + +a = Analysis(['pydle.py'], + pathex=[], + binaries=[], + datas=[('words.txt', '.')], + hiddenimports=[], + hookspath=[], + runtime_hooks=[], + excludes=[], + win_no_prefer_redirects=False, + win_private_assemblies=False, + cipher=block_cipher, + noarchive=False) +pyz = PYZ(a.pure, a.zipped_data, + cipher=block_cipher) + +exe = EXE(pyz, + a.scripts, + a.binaries, + a.zipfiles, + a.datas, + [], + name='pydle', + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + upx_exclude=[], + runtime_tmpdir=None, + console=True, + disable_windowed_traceback=False, + target_arch=None, + codesign_identity=None, + entitlements_file=None ) diff --git a/words.txt b/src/words.txt similarity index 100% rename from words.txt rename to src/words.txt