Skip to content

Commit 882f3ea

Browse files
committed
Merge branch 'main' into release/0.3
2 parents 9fb7c6e + 3a9d5c8 commit 882f3ea

File tree

15 files changed

+154
-59
lines changed

15 files changed

+154
-59
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,3 +162,4 @@ cython_debug/
162162
#.idea/
163163

164164
# End of https://www.toptal.com/developers/gitignore/api/python
165+
.vscode/settings.json

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repos:
1313
- --line-length=88
1414

1515
- repo: https://github.com/psf/black
16-
rev: 24.2.0
16+
rev: 24.3.0
1717
hooks:
1818
- id: black
1919
args:
@@ -54,7 +54,7 @@ repos:
5454

5555
# this validates our github workflow files
5656
- repo: https://github.com/python-jsonschema/check-jsonschema
57-
rev: 0.28.0
57+
rev: 0.28.1
5858
hooks:
5959
- id: check-github-workflows
6060

doc/source/installer.rst

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ Installing the ``Ansys Python Manager``
3030
#. **OS** supported for **Ubuntu(20.04 and 22.04)**.
3131

3232
#. Update ``apt-get`` repository and install the following packages with **sudo** privileges:
33-
**libffi-dev, libssl-dev, libsqlite3-dev, libxcb-xinerama0 and build-essential** packages with **sudo** privileges
33+
**wget, gnome, libffi-dev, libssl-dev, libsqlite3-dev, libxcb-xinerama0 and build-essential** packages with **sudo** privileges
3434

3535
.. code:: shell
3636
3737
sudo apt-get update -y
38-
sudo apt-get install libffi-dev libssl-dev libsqlite3-dev libxcb-xinerama0 build-essential -y
38+
sudo apt-get install wget gnome libffi-dev libssl-dev libsqlite3-dev libxcb-xinerama0 build-essential -y
3939
4040
#. Install **zlib** package
4141

@@ -71,12 +71,17 @@ Installing the ``Ansys Python Manager``
7171

7272
#. In the pop up window:
7373

74-
* If you want to remove all the virtual environments as part of
75-
uninstallation, mark ``Delete virtual environment`` checkbox
74+
* If you want to remove all virtual environments which were created by
75+
the Ansys Python Manager as part of uninstallation, mark
76+
``Delete virtual environments`` checkbox
7677

77-
* If you want to remove all the configurations as part of
78+
* If you want to remove all configurations as part of
7879
uninstallation, mark ``Delete configurations`` checkbox
7980

81+
* If you want to remove all Python installations which were installed by
82+
the Ansys Python Manager as part of uninstallation, mark
83+
``Delete Python installations`` checkbox
84+
8085
#. Click ``Uninstall`` button.
8186

8287

@@ -87,13 +92,13 @@ Installing the ``Ansys Python Manager``
8792
#. **OS** supported for **CentOS9** and **RHEL9**.
8893

8994
#. Update ``yum`` repository and install the following packages with **sudo** privileges:
90-
**Development Tools, libffi-devel, openssl-devel, rpm-build, sqlite-devel, sqlite-libs, libXinerama-devel**
95+
**wget, gnome-terminal, Development Tools, libffi-devel, openssl-devel, rpm-build, sqlite-devel, sqlite-libs, libXinerama-devel, coreutils**
9196

9297
.. code:: shell
9398
9499
sudo yum update -y;
95100
sudo yum groupinstall 'Development Tools' -y;
96-
sudo yum install libffi-devel openssl-devel rpm-build sqlite-devel sqlite-libs libXinerama-devel -y;
101+
sudo yum install wget gnome-terminal libffi-devel openssl-devel rpm-build sqlite-devel sqlite-libs libXinerama-devel coreutils -y;
97102
98103
#. Install **zlib** package using **wget**
99104

@@ -130,12 +135,17 @@ Installing the ``Ansys Python Manager``
130135

131136
#. In the pop up window:
132137

133-
* If you want to remove all the virtual environments as part of
134-
uninstallation, mark ``Delete virtual environment`` checkbox
138+
* If you want to remove all virtual environments which were created by
139+
the Ansys Python Manager as part of uninstallation, mark
140+
``Delete virtual environments`` checkbox
135141

136-
* If you want to remove all the configurations as part of
142+
* If you want to remove all configurations as part of
137143
uninstallation, mark ``Delete configurations`` checkbox
138144

145+
* If you want to remove all Python installations which were installed by
146+
the Ansys Python Manager as part of uninstallation, mark
147+
``Delete Python installations`` checkbox
148+
139149
#. Click ``Uninstall`` button.
140150

141151
#. Follow the uninstaller script & provide sudo permission to uninstall the application.
@@ -147,13 +157,13 @@ Installing the ``Ansys Python Manager``
147157
#. **OS** supported for **Fedora39**.
148158

149159
#. Update ``yum`` repository and install the following packages with **sudo** privileges:
150-
**Development Tools, libffi-devel, openssl-devel, rpm-build, sqlite-devel, sqlite-libs, libXinerama-devel**
160+
**wget, gnome-terminal, Development Tools, libffi-devel, openssl-devel, rpm-build, sqlite-devel, sqlite-libs, libXinerama-devel, coreutils**
151161

152162
.. code:: shell
153163
154164
sudo yum update -y;
155165
sudo yum groupinstall 'Development Tools' -y;
156-
sudo yum install libffi-devel openssl-devel rpm-build sqlite-devel sqlite-libs libXinerama-devel -y;
166+
sudo yum install wget gnome-terminal libffi-devel openssl-devel rpm-build sqlite-devel sqlite-libs libXinerama-devel coreutils -y;
157167
158168
#. Install **zlib** package using **wget**
159169

@@ -190,12 +200,17 @@ Installing the ``Ansys Python Manager``
190200

191201
#. In the pop up window:
192202

193-
* If you want to remove all the virtual environments as part of
194-
uninstallation, mark ``Delete virtual environment`` checkbox
203+
* If you want to remove all virtual environments which were created by
204+
the Ansys Python Manager as part of uninstallation, mark
205+
``Delete virtual environments`` checkbox
195206

196-
* If you want to remove all the configurations as part of
207+
* If you want to remove all configurations as part of
197208
uninstallation, mark ``Delete configurations`` checkbox
198209

210+
* If you want to remove all Python installations which were installed by
211+
the Ansys Python Manager as part of uninstallation, mark
212+
``Delete Python installations`` checkbox
213+
199214
#. Click ``Uninstall`` button.
200215

201216
#. Follow the uninstaller script & provide sudo permission to uninstall the application.

doc/source/user_guide.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ have options available, such as deleting a virtual environment, Launch
9696
Options, General Package Management, and PyAnsys Package Management for
9797
the selected virtual environment. You can also delete a virtual
9898
environment by selecting it from the available list under “Available
99-
virtual environments” and clicking on the “Delete virtual environment
99+
virtual environments” and clicking on the “Delete virtual environments
100100
option available with context menu.
101101

102102
.. image:: _static/manage_venv_tab.PNG

linux/debian/installer.sh

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ else
1313
dependencies_available=false
1414
fi
1515
# check other dependencies
16-
arr=("libffi-dev" "libssl-dev" "build-essential" "libsqlite3-dev" "libxcb-xinerama0")
16+
arr=("wget" "gnome" "libffi-dev" "libssl-dev" "build-essential" "libsqlite3-dev" "libxcb-xinerama0")
1717
for x in "${arr[@]}"; do
1818
c="dpkg -s $x >/dev/null 2>&1"
1919
eval $c
@@ -28,7 +28,13 @@ done
2828
if [ $dependencies_available = true ]; then
2929
dpkg -x ./ansys_python_manager.deb ${HOME}/.local
3030
./postInstallScript.sh
31-
printf "\nInstallation success...\n"
31+
available=$(cat ~/.bashrc | grep -zoP "# Add alias for Ansys Python Manager \nalias ansys_python_manager=~/.local/opt/ansys_python_manager/ansys_python_manager" | wc -l)
32+
echo $available
33+
if [ $available -lt 1 ]
34+
then
35+
echo -e "# Add alias for Ansys Python Manager \nalias ansys_python_manager=~/.local/opt/ansys_python_manager/ansys_python_manager" >> ~/.bashrc
36+
fi
37+
printf "\nInstallation successful. \nIt is suggested to restart your machine to begin using the software....\n"
3238
else
3339
echo "Missing dependencies..."
3440
while true; do
@@ -69,7 +75,7 @@ else
6975
dependencies_available=false
7076
fi
7177
# check other dependencies
72-
arr=("libffi-dev" "libssl-dev" "build-essential" "libsqlite3-dev" "libxcb-xinerama0")
78+
arr=("wget" "gnome" "libffi-dev" "libssl-dev" "build-essential" "libsqlite3-dev" "libxcb-xinerama0")
7379
for x in "${arr[@]}"; do
7480
c="dpkg -s $x >/dev/null 2>&1"
7581
eval $c
@@ -86,7 +92,13 @@ else
8692
else
8793
dpkg -x ./ansys_python_manager.deb ${HOME}/.local
8894
./postInstallScript.sh
89-
printf "\nInstallation success...\n"
95+
available=$(cat ~/.bashrc | grep -zoP "# Add alias for Ansys Python Manager \nalias ansys_python_manager=~/.local/opt/ansys_python_manager/ansys_python_manager" | wc -l)
96+
echo $available
97+
if [ $available -lt 1 ]
98+
then
99+
echo -e "# Add alias for Ansys Python Manager \nalias ansys_python_manager=~/.local/opt/ansys_python_manager/ansys_python_manager" >> ~/.bashrc
100+
fi
101+
printf "\nInstallation successful. \nIt is suggested to restart your machine to begin using the software....\n"
90102
fi
91103
else
92104
echo "You don't have access to sudo. Please try again..."

linux/non-debian/installer_CentOS.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if [ "$user_selection" = "Y" ]; then
3434
missing_deps+=("Development Tools")
3535
dependencies_available=false
3636
fi
37-
arr=("wget" "libffi-devel" "openssl-devel" "rpm-build" "sqlite-devel" "sqlite-libs" "libXinerama-devel")
37+
arr=("wget" "gnome-terminal" "libffi-devel" "openssl-devel" "rpm-build" "sqlite-devel" "sqlite-libs" "libXinerama-devel" "coreutils")
3838
for x in "${arr[@]}"; do
3939
c="rpm -qa | grep $x"
4040
eval $c
@@ -48,7 +48,13 @@ if [ "$user_selection" = "Y" ]; then
4848
done
4949
if [ $dependencies_available = true ]; then
5050
sudo rpm -iv ansys_python_manager_*.rpm
51-
printf "\nInstallation success...\n"
51+
available=$(cat ~/.bashrc | grep -zoP "# Add alias for Ansys Python Manager \nalias ansys_python_manager=~/.local/opt/ansys_python_manager/ansys_python_manager" | wc -l)
52+
echo $available
53+
if [ $available -lt 1 ]
54+
then
55+
echo -e "# Add alias for Ansys Python Manager \nalias ansys_python_manager=~/.local/opt/ansys_python_manager/ansys_python_manager" | sudo tee -a ~/.bashrc
56+
fi
57+
printf "\nInstallation success...\nIt is suggested to restart your machine to begin using the software....\n"
5258
else
5359
echo "Missing dependencies..."
5460
install_script="sudo yum update -y; sudo yum install "

pyproject.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,31 +36,31 @@ dynamic = ["version"]
3636
[project.optional-dependencies]
3737
tests = [
3838
"packaging==24.0",
39-
"PyGithub==2.2.0",
39+
"PyGithub==2.3.0",
4040
"appdirs==1.4.4",
4141
"requests==2.31.0",
42-
"PySide6==6.6.2",
43-
"ansys-tools-path==0.4.1",
42+
"PySide6==6.6.3.1",
43+
"ansys-tools-path==0.5.1",
4444
"pytest==8.1.1",
45-
"pytest-cov==4.1.0",
45+
"pytest-cov==5.0.0",
4646
"pytest-qt==4.4.0",
47-
"setuptools==69.1.1",
47+
"setuptools==69.2.0",
4848
]
4949
doc = [
5050
"Sphinx==7.2.6",
51-
"ansys-sphinx-theme==0.14.0",
51+
"ansys-sphinx-theme==0.15.1",
5252
"sphinx-copybutton==0.5.2",
5353
"sphinx_design==0.5.0",
5454
"sphinx_toolbox==3.5.0",
5555
]
5656
freeze = [
5757
"pyinstaller==6.5.0",
5858
"packaging==24.0",
59-
"PyGithub==2.2.0",
59+
"PyGithub==2.3.0",
6060
"appdirs==1.4.4",
6161
"requests==2.31.0",
62-
"PySide6==6.6.2",
63-
"ansys-tools-path==0.4.1",
62+
"PySide6==6.6.3.1",
63+
"ansys-tools-path==0.5.1",
6464
]
6565

6666
[tool.flit.module]

src/ansys/tools/installer/assets/scripts/uninstaller_ubuntu.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ rm -rf ${HOME}/.local/share/applications/ansys_python_manager.desktop
66
rm -rf ${HOME}/.local/usr/share/doc/ansys-python-manager
77

88
rm -rf ${HOME}/.local/opt/ansys_python_manager
9+
10+
sed -i '/# Add alias for Ansys Python Manager/d' ~/.bashrc
11+
sed -i '/alias ansys_python_manager/d' ~/.bashrc

src/ansys/tools/installer/assets/scripts/uninstaller_yum.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
while true; do
2-
read -p "Require sudo permission to uninstall this package and the dependencies. Do you want to continue?(Y/N): " user_selection
2+
read -p "Require sudo permission to uninstall this package. Do you want to continue?(Y/N): " user_selection
33
if [ "$user_selection" = "Y" ] || [ "$user_selection" = "N" ]; then
44
break
55
fi
@@ -14,12 +14,14 @@ if [ "$user_selection" = "Y" ]; then
1414
echo "Uninstalling Ansys Python Manager......."
1515
sleep 2
1616
sudo yum remove -y ansys_python_manager.x86_64
17+
sudo sed -i '/# Add alias for Ansys Python Manager/d' ~/.bashrc
18+
sudo sed -i '/alias ansys_python_manager/d' ~/.bashrc
1719
printf "\nUninstalled successfully...\n"
1820
else
1921
echo "You don't have access to sudo. Please try again..."
2022
fi
2123
else
2224
# Script aborted by user
2325
printf "Aborting....\nUser permission denied.... \n\n"
24-
echo "Ansys Python Manager and required dependencies require sudo access to uninstall."
26+
echo "Ansys Python Manager package requires sudo access to uninstall."
2527
fi

src/ansys/tools/installer/constants.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@
3535

3636
ABOUT_TEXT = f"""<h2>Ansys Python Installer {__version__}</h2>
3737
<p>Created by the PyAnsys Team.</p>
38+
<p>Project build using <a href='https://wiki.qt.io/Qt_for_Python'> PySide6</a> and <a href='https://pyinstaller.org/en/stable/'> PyInstaller</a>.</p>
3839
<p>If you have any questions or issues, please open an issue in <a href='https://github.com/ansys/python-installer-qt-gui/issues'>python-installer-qt-gui Issues</a> page.</p>
3940
<p>Alternatively, you can contact us at <a href='mailto:pyansys.core@ansys.com'>pyansys.core@ansys.com</a>.</p>
4041
<p>Your use of this software is governed by the MIT License. In addition, this installer allows you to access and install software that is licensed under separate terms ("Separately Licensed Software"). If you chose to install such Separately Licensed Software, you acknowledge that you are responsible for complying with any associated terms and conditions.</p>
41-
<p>Copyright 2023 ANSYS, Inc. All rights reserved.</p>
42+
<p>Copyright 2023 - 2024 ANSYS, Inc. All rights reserved.</p>
4243
"""
4344

4445
UNABLE_TO_RETRIEVE_LATEST_VERSION_TEXT = f"""
@@ -67,6 +68,9 @@
6768
6869
While choosing the latest version of Python is generally recommended, some third-party libraries and applications may not yet be fully compatible with the newest release. Therefore, it is recommended to try the second newest version, as it will still have most of the latest features and improvements while also having broader support among third-party packages."""
6970

71+
PRE_COMPILED_PYTHON_WARNING = """
72+
<b>NOTE:</b> Only 'Python 3.11' version is readily available. Other Python versions are compiled from source and it takes approximately 2-3 minutes."""
73+
7074
PYTHON_VERSION_SELECTION_FOR_VENV = """Choose the version of Python to use for your virtual environment.
7175
7276
Please select the Python version from the table below to create its respective virtual environment."""

0 commit comments

Comments
 (0)