diff --git a/CHANGELOG.md b/CHANGELOG.md index f2d665e..0b16649 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,3 +12,12 @@ Miscellaneous: 1. Moved feedback & scoreboard links for bot reply into configuration 2. Changed program entry point to `PointsBot.py` 3. Added ability to freeze the app as a simple executable + +## 2020/08/21 + +Features: N/A + +Fixes: +1. Removed freezing to comply with r/RequestABot guidelines + +Miscellaneous: N/A diff --git a/Pipfile b/Pipfile index cf9fdec..9a38135 100644 --- a/Pipfile +++ b/Pipfile @@ -4,7 +4,6 @@ url = "https://pypi.org/simple" verify_ssl = true [dev-packages] -pyinstaller = "*" [packages] toml = "*" diff --git a/Pipfile.lock b/Pipfile.lock index f8556e2..8cbe51a 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "d2ab36131af79e2a9efe43cbaf017a804bbf43d83863ec9ff3cba1987535ee30" + "sha256": "c5de2f495184b77e04ef9eeabbf802ca765c0a28bc36b8e6f84da0dcac053224" }, "pipfile-spec": 6, "requires": { @@ -18,10 +18,10 @@ "default": { "certifi": { "hashes": [ - "sha256:1d987a998c75633c40847cc966fcf5904906c920a7f17ef374f5aa4282abd304", - "sha256:51fcb31174be6e6664c5f69e3e1691a2d72a1a12e90f872cbdb1567eb47b6519" + "sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3", + "sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41" ], - "version": "==2020.4.5.1" + "version": "==2020.6.20" }, "chardet": { "hashes": [ @@ -32,62 +32,61 @@ }, "idna": { "hashes": [ - "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb", - "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa" + "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6", + "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0" ], - "version": "==2.9" + "version": "==2.10" }, "praw": { "hashes": [ - "sha256:65129169d560800261908415ed955f3cbc63648549820b3ccce0a823ffa2fd78", - "sha256:74e4b6c3f206342d05272ce1770ac7b9c48207c9a7ffea3d5251460b70f18188", - "sha256:dcdcf13b7f7ae2393afd914644bf16b254eaf5230c81adf2feafe1ec514307ca" + "sha256:6b93ad1e53385c68753203ec87f4d0053b2425b09fc8813847800a542efdfe6c", + "sha256:fb55e46203a771342da7cbe144fbcd8c61d825719ce1025bdd72112194a0228f" ], "index": "pypi", - "version": "==7.0.0" + "version": "==7.1.0" }, "prawcore": { "hashes": [ - "sha256:a982a49bc911fe0e3a9751319091c380f79d5e1ba1ba19cb8dbbce21ad8b0ca7", - "sha256:b907843ab969d759cbc03f1f749acea24d11859d6aed447b2fa1cd0eda9ecf34" + "sha256:1f1eafc8a65d671f9892354f73142014fbb5d3a9ee621568c662d0a354e0578b", + "sha256:672d8a2faa12b44307874b2acfdd27f9cbaa5fa37bada4b34e36277224e6d8ed" ], - "version": "==1.3.0" + "version": "==1.5.0" }, "requests": { "hashes": [ - "sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee", - "sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6" + "sha256:b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b", + "sha256:fe75cc94a9443b9246fc7049224f75604b113c36acb93f87b80ed42c44cbb898" ], - "version": "==2.23.0" + "version": "==2.24.0" }, "six": { "hashes": [ - "sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a", - "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c" + "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", + "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced" ], - "version": "==1.14.0" + "version": "==1.15.0" }, "toml": { "hashes": [ - "sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", - "sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e" + "sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f", + "sha256:bda89d5935c2eac546d648028b9901107a595863cb36bae0c73ac804a9b4ce88" ], "index": "pypi", - "version": "==0.10.0" + "version": "==0.10.1" }, "update-checker": { "hashes": [ - "sha256:1ff5dc7aab340b4f7710bd6c69d08ff5a5351617cd4ba0eb8886ddb285e2104f", - "sha256:2def8db7f63bd45c7d19df5df570f3f3dfeb1a1f050869d7036529295db10e62" + "sha256:6a2d45bb4ac585884a6b03f9eade9161cedd9e8111545141e9aa9058932acb13", + "sha256:cbba64760a36fe2640d80d85306e8fe82b6816659190993b7bdabadee4d4bbfd" ], - "version": "==0.17" + "version": "==0.18.0" }, "urllib3": { "hashes": [ - "sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527", - "sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115" + "sha256:91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a", + "sha256:e7983572181f5e1522d9c98453462384ee92a0be7fac5f1413a1e35c56cc0461" ], - "version": "==1.25.9" + "version": "==1.25.10" }, "websocket-client": { "hashes": [ @@ -97,39 +96,5 @@ "version": "==0.57.0" } }, - "develop": { - "altgraph": { - "hashes": [ - "sha256:1f05a47122542f97028caf78775a095fbe6a2699b5089de8477eb583167d69aa", - "sha256:c623e5f3408ca61d4016f23a681b9adb100802ca3e3da5e718915a9e4052cebe" - ], - "version": "==0.17" - }, - "future": { - "hashes": [ - "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d" - ], - "version": "==0.18.2" - }, - "pefile": { - "hashes": [ - "sha256:a5d6e8305c6b210849b47a6174ddf9c452b2888340b8177874b862ba6c207645" - ], - "version": "==2019.4.18" - }, - "pyinstaller": { - "hashes": [ - "sha256:3730fa80d088f8bb7084d32480eb87cbb4ddb64123363763cf8f2a1378c1c4b7" - ], - "index": "pypi", - "version": "==3.6" - }, - "pywin32-ctypes": { - "hashes": [ - "sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942", - "sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98" - ], - "version": "==0.2.0" - } - } + "develop": {} } diff --git a/PointsBot.spec b/PointsBot.spec deleted file mode 100644 index cb9c1ba..0000000 --- a/PointsBot.spec +++ /dev/null @@ -1,33 +0,0 @@ -# -*- mode: python ; coding: utf-8 -*- - -block_cipher = None - - -a = Analysis(['PointsBot.py'], - pathex=['C:\\Users\\Collin\\Documents\\git\\PointsBot'], - binaries=[], - datas=[], - hiddenimports=[], - hookspath=['.\\pyinstaller-hooks\\'], - 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='PointsBot', - debug=False, - bootloader_ignore_signals=False, - strip=False, - upx=True, - upx_exclude=[], - runtime_tmpdir=None, - console=True ) diff --git a/README.md b/README.md index 59e076e..9ed3b22 100644 --- a/README.md +++ b/README.md @@ -43,13 +43,7 @@ awarded for each submission. ### Basic Installation -These are the instructions for simply using the bot without needing to edit the -code. These instructions are best suited for users with less technical -experience. - -Go the the [releases page](https://github.com/cur33/PointsBot/releases) for this -project, then download and unzip the latest release. Make sure you pick the -release best suited for your machine & operating system. +**IN PROGRESS** ### Advanced Installation @@ -159,13 +153,7 @@ TOML syntax used for the file can be found on ### Basic Usage -Follow these instructions if you downloaded the bot from the releases page in -the [Installation](#installation) step above. - -In the unzipped folder, double-click on the `PointsBot.exe` file. It will open a -command prompt that will ask you for any additional information it may require. -You will *not* need any knowledge of the command prompt for your operating -system to interact with the bot. +**IN PROGRESS** ### Advanced Usage diff --git a/freeze.cmd b/freeze.cmd deleted file mode 100644 index 251dfe9..0000000 --- a/freeze.cmd +++ /dev/null @@ -1,23 +0,0 @@ -@echo off - -set dest=".\dist\" - -REM The below is an alternative to using a custom hook for praw -REM FOR /F "tokens=* USEBACKQ" %%F IN (`pipenv --venv`) DO ( - REM SET pipenvdir=%%F -REM ) -REM --add-data "%pipenvdir%\Lib\site-packages\praw\praw.ini;site-packages\praw\praw.ini" ^ - -REM using the --noconfirm option sometimes causes issues when rebuilding -REM (ie when it tries to delete the previous dist directory) -pyinstaller ^ - --onefile ^ - --additional-hooks-dir .\pyinstaller-hooks\ ^ - PointsBot.py - -copy ".\README.md" %dest% -copy ".\LICENSE.md" %dest% -copy ".\CHANGELOG.md" %dest% - -mkdir .\releases\ -powershell Compress-Archive -Force .\dist\* .\releases\PointsBot_Windows_x64.zip diff --git a/freeze.sh b/freeze.sh deleted file mode 100644 index 8d5eef0..0000000 --- a/freeze.sh +++ /dev/null @@ -1,5 +0,0 @@ -pyinstaller \ - --noconfirm \ - --onedir \ - --additional-hooks-dir ./pyinstaller-hooks/ \ - PointsBot.py diff --git a/pyinstaller-hooks/hook-praw.py b/pyinstaller-hooks/hook-praw.py deleted file mode 100644 index 706a285..0000000 --- a/pyinstaller-hooks/hook-praw.py +++ /dev/null @@ -1,3 +0,0 @@ -from PyInstaller.utils.hooks import collect_data_files - -datas = collect_data_files('praw')