Skip to content

Commit 7438219

Browse files
authored
Fix setup.py deprecation warnings and appveyor (#231)
* Bump gevent * Fix setup.py deprecations * Update LISS * Update appveyor script * Change username to `__token__` * Update `items.csv` * Fix community events gui * Update secure token in .appveyor.yml
1 parent 44daacf commit 7438219

8 files changed

Lines changed: 504 additions & 40 deletions

File tree

.appveyor.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '{build}'
22

33
environment:
44
pypipw:
5-
secure: AnvQqXXhbyfD5/CeJkbivk088RZBnIObU2mXBLH2paw=
5+
secure: tTJUexu4V68/Zbl3l/K7x8eI4TR56JZhn2DEvCemP8zNYPCkcFgYfaGp27c6fCoPpgWEvyzJjYyqAzsxLl4mYKtMDEtV9a1B9tD2ElnbERnxpvK4lldg8fAhdpYFw+L3EqPLEaVTAROysUl4w+qf+OQrEet6kcdMGa7jlXSFdqjW/kjU4/SdSD/mQp/Uec4GqcyvxXb8wIm1+tjblFxm9yVh6FfcDdv6/WEm3nWuveUpfQ3yxx6B5RY3SfTySgsS6izSMp//Yqgo5feJ3snv7MzKBezYW90OabQ7Af8o9jY=
66

77
matrix:
88
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
@@ -13,7 +13,7 @@ branches:
1313
- master
1414

1515
install:
16-
- cmd: "%PYTHON% -m pip install --upgrade pip wheel twine"
16+
- cmd: "%PYTHON% -m pip install --upgrade pip wheel build twine"
1717

1818
build_script:
1919
- cmd: "%PYTHON% -m pip install ."
@@ -23,9 +23,9 @@ artifacts:
2323

2424
after_test:
2525
- cmd: "echo [pypi] > %USERPROFILE%\\.pypirc"
26-
- cmd: "echo username: RLBotOfficial >> %USERPROFILE%\\.pypirc"
26+
- cmd: "echo username: __token__ >> %USERPROFILE%\\.pypirc"
2727
- cmd: "echo password: %pypipw% >> %USERPROFILE%\\.pypirc"
28-
- cmd: "%PYTHON% setup.py bdist_wheel sdist"
28+
- cmd: "%PYTHON% -m build"
2929

3030
on_success:
3131
- cmd: "%PYTHON% -m twine upload dist\\*"

linux-install/README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
# RLBotGUI via LISS
2+
23
This stands for the Rocket League Bot Graphical User Interface via the Linux Installation Shell Script.
34

45
## First-time installation with LISS
56

67
1. Download `RLBotGUI.sh` (Or save [this file](https://raw.githubusercontent.com/RLBot/RLBotGUI/master/linux-install/RLBotGUI.sh))
78
2. `chmod +x path/to/RLBotGUI.sh`
89
3. `path/to/RLBotGUI` (`./RLBotGUI` if it's in the current folder)
9-
4. You will be asked to provide your sudo password. The RLBotGUI requires sudo in order to run:
10+
4. Do not run the script with sudo - you will be asked to provide your sudo password after it starts, _if needed_. LISS requires sudo in order to run:
1011

1112
- `sudo apt install software-properties-common` (If needed)
1213
- `sudo add-apt-repository ppa:deadsnakes/ppa` (If needed; this is the Linux Python archive - https://github.com/deadsnakes)
1314
- `sudo apt update`
14-
- `sudo apt install build-essential python3.7-dev python3.7-venv python3-distutils` (If needed)
15+
- `sudo apt install build-essential python3.11-dev python3.11-venv python3.11-distutils` (If needed)
1516

1617
We won't do anything else with the sudo permission you give us, and is only required for installation.
1718

18-
5. Once LISS does its thing, the RLBotGUI will open! You can now take `RLBotGUI.sh` and put it wherever in your system you want. The RLBotGUI has been installed, and you won't need to do it again. (Unless something breaks, then you will have to re-download this script.)
19+
5. Once LISS does its thing, RLBotGUI will open! You can now take `RLBotGUI.sh` and put it wherever in your system you want.
20+
The RLBotGUI has been installed, and you can just keep running it every time you want to use RLBotGUI and it will update itself if needed.
1921

2022
## Opening RLBotGUI after installation
2123

2224
1. Where ever you've put `RLBotGUI.sh`, run it using `path/to/RLBotGUI.sh`
23-
3. LISS will now update all dependencies, if you have internet access. (`pip`, `setuptools`, `wheel`, `eel`, `rlbot_gui` and `rlbot`)
24-
4. RLBotGUI will then launch in Chrome, or your defaut system browser if Chrome isn't installed.
25+
2. LISS will now update all dependencies, if you have internet access. (`pip`, `setuptools`, `wheel`, `eel`, `rlbot_gui` and `rlbot`)
26+
3. RLBotGUI will then launch in Chrome, or your default system browser if Chrome isn't installed.

linux-install/RLBotGUI.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,33 @@ fi
1212

1313
pushd "$HOME/.RLBotGUI"
1414

15-
# If any version of Python 3.7 is not installed, then install it
15+
# If any version of Python 3.11 is not installed, then install it
1616

17-
python3.7 -V
17+
python3.11 -V
1818
if [ $? -gt 0 ]
1919
then
2020
echo
21-
echo "Invalid Python install. Installing Python 3.7, and possibly not present dependencies..."
21+
echo "Invalid Python install. Installing Python 3.11, and possibly not present dependencies..."
2222
echo
2323
sudo apt install software-properties-common
2424
sudo add-apt-repository ppa:deadsnakes/ppa
2525
sudo apt update
26-
sudo apt install python3.7
26+
sudo apt install python3.11
2727

2828
# Instead of waiting to see if these aren't installed, just install them. If they're already installed, then nothing will happen.
2929
echo
30-
echo "Installing build-essential, python3.7-dev, python3.7-venv, python3-distutils..."
30+
echo "Installing build-essential, python3.11-dev, python3.11-venv, python3.11-distutils..."
3131
echo
32-
sudo apt install build-essential python3.7-dev python3.7-venv python3-distutils
32+
sudo apt install build-essential python3.11-dev python3.11-venv, python3.11-distutils
3333
fi
3434

3535
# Check if the virtual environment exists
3636

3737
if [ ! -e "$HOME/.RLBotGUI/env/bin/activate" ]
3838
then
3939
echo
40-
echo "Creating the Python 3.7 Virtual Environment"
41-
python3.7 -m venv env
40+
echo "Creating the Python 3.11 Virtual Environment"
41+
python3.11 -m venv env
4242
fi
4343

4444
# Enter the virtual environment

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ rlbot==1.*
55
# This will cause pip to auto-upgrade and stop scaring people with warning messages
66
pip
77

8-
gevent<22
8+
gevent==24.*
99
eel>=0.12
1010
PyQt5

rlbot_gui/gui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ def filter_hidden_bundles(bundles):
388388
@eel.expose
389389
def get_language_support():
390390
java_return_code = os.system("java -version 2> nul")
391-
node_return_code = os.system("node --version> nul")
391+
node_return_code = os.system("node --version > nul")
392392
# Only bother returning iffy languages. No point in sending 'python': True
393393
return {
394394
'java': java_return_code == 0,

0 commit comments

Comments
 (0)