Skip to content

Commit f22e6bd

Browse files
committed
Merge branch 'main' into release/0.3
2 parents 87332c7 + 102cb0e commit f22e6bd

File tree

6 files changed

+34
-28
lines changed

6 files changed

+34
-28
lines changed

.github/workflows/ci_cd.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,8 @@ jobs:
256256
python3-pip \
257257
wget \
258258
binutils \
259+
ruby-devel \
260+
rubygems \
259261
rpm-build \
260262
openssl \
261263
fontconfig-devel \

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ repos:
3131
- id: flake8
3232

3333
- repo: https://github.com/codespell-project/codespell
34-
rev: v2.2.6
34+
rev: v2.3.0
3535
hooks:
3636
- id: codespell
3737
args: ["--toml", "pyproject.toml"]
@@ -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.3
57+
rev: 0.28.4
5858
hooks:
5959
- id: check-github-workflows
6060

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ contributors and maintainers pledge to making participation in our
77
project and our community a harassment-free experience for everyone,
88
regardless of age, body size, disability, ethnicity, sex
99
characteristics, gender identity and expression, level of experience,
10-
education, socio-economic status, nationality, personal appearance,
10+
education, socioeconomic status, nationality, personal appearance,
1111
race, religion, or sexual identity and orientation.
1212

1313
## Our Standards

pyproject.toml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,29 +38,29 @@ tests = [
3838
"packaging==24.0",
3939
"PyGithub==2.3.0",
4040
"appdirs==1.4.4",
41-
"requests==2.31.0",
42-
"PySide6==6.7.0",
43-
"ansys-tools-path==0.5.2",
44-
"pytest==8.2.0",
41+
"requests==2.32.3",
42+
"PySide6==6.7.1",
43+
"ansys-tools-path==0.6.0",
44+
"pytest==8.2.1",
4545
"pytest-cov==5.0.0",
4646
"pytest-qt==4.4.0",
47-
"setuptools==69.5.1",
47+
"setuptools==70.0.0",
4848
]
4949
doc = [
5050
"Sphinx==7.3.7",
51-
"ansys-sphinx-theme==0.15.2",
51+
"ansys-sphinx-theme==0.16.5",
5252
"sphinx-copybutton==0.5.2",
53-
"sphinx_design==0.5.0",
53+
"sphinx_design==0.6.0",
5454
"sphinx_toolbox==3.5.0",
5555
]
5656
freeze = [
57-
"pyinstaller==6.6.0",
57+
"pyinstaller==6.7.0",
5858
"packaging==24.0",
5959
"PyGithub==2.3.0",
6060
"appdirs==1.4.4",
61-
"requests==2.31.0",
62-
"PySide6==6.7.0",
63-
"ansys-tools-path==0.5.2",
61+
"requests==2.32.3",
62+
"PySide6==6.7.1",
63+
"ansys-tools-path==0.6.0",
6464
]
6565

6666
[tool.flit.module]
@@ -88,7 +88,6 @@ line-length = 100
8888
profile = "black"
8989
force_sort_within_sections = true
9090
line_length = 100
91-
default_section = "THIRDPARTY"
9291
src_paths = ["doc", "src", "tests"]
9392

9493
[tool.coverage.run]

scripts/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
requests==2.31.0
1+
requests==2.32.3
22
packaging==24.0

src/ansys/tools/installer/common.py

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,18 +106,23 @@ def get_pkg_versions(pkg_name):
106106
"""
107107
session = requests.Session()
108108
session.verify = False
109-
url = f"https://pypi.python.org/pypi/{pkg_name}/json"
110-
111-
try:
112-
releases = json.loads(requests.get(url, verify=certifi.where()).content)[
113-
"releases"
114-
]
115-
all_versions = sorted(releases, key=parse_version, reverse=True)
116-
if pkg_name == "pyansys":
117-
all_versions = [x for x in all_versions if int(x.split(".")[0]) > 0]
118-
except (requests.exceptions.SSLError, requests.exceptions.ConnectionError):
119-
LOG.warning(f"Cannot connect to {url}... No version listed.")
120-
all_versions = [""]
109+
urls = [
110+
f"https://pypi.python.org/pypi/{pkg_name}/json",
111+
f"https://pypi.org/pypi/{pkg_name}/json",
112+
]
113+
all_versions = [""]
114+
115+
for url in urls:
116+
try:
117+
releases = json.loads(requests.get(url, verify=certifi.where()).content)[
118+
"releases"
119+
]
120+
all_versions = sorted(releases, key=parse_version, reverse=True)
121+
if pkg_name == "pyansys":
122+
all_versions = [x for x in all_versions if int(x.split(".")[0]) > 0]
123+
break
124+
except (requests.exceptions.SSLError, requests.exceptions.ConnectionError):
125+
LOG.warning(f"Cannot connect to {url}... No version listed.")
121126

122127
session.verify = True
123128

0 commit comments

Comments
 (0)