From 6a01d0226956de19b69ec6ba21f95cc7bbd9d282 Mon Sep 17 00:00:00 2001 From: ScriptAutomate Date: Tue, 26 Nov 2024 17:21:16 -0600 Subject: [PATCH] Update various out-dated links, emails, etc. --- .github/ISSUE_TEMPLATE/config.yml | 3 - .github/ISSUE_TEMPLATE/tech-debt.md | 2 +- .github/config.yml | 12 +- AUTHORS | 112 ++---------------- CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.rst | 6 +- README.rst | 42 +++---- SUPPORT.rst | 25 ++-- doc/_themes/saltstack/layout.html | 4 +- doc/_themes/saltstack2/layout.html | 2 +- doc/conf.py | 14 --- doc/faq.rst | 2 +- doc/ref/configuration/delta_proxy.rst | 4 +- doc/ref/modules/index.rst | 2 - .../development/conventions/formulas.rst | 12 +- doc/topics/development/conventions/style.rst | 2 +- pkg/old/suse/salt-api.spec | 2 +- pkg/old/suse/salt.spec | 2 +- pkg/rpm/salt.bash | 3 - salt/modules/tls.py | 2 +- salt/renderers/stateconf.py | 2 +- .../pytests/pkg/download/test_pkg_download.py | 2 +- tests/support/pkg.py | 2 +- tests/support/win_installer.py | 2 +- 24 files changed, 64 insertions(+), 199 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 690b27ae672..c5fcbf50fca 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -6,6 +6,3 @@ contact_links: - name: Salt-Users Forum url: https://groups.google.com/forum/#!forum/salt-users about: Please ask and answer questions here. - - name: Salt on LiberaChat - url: https://web.libera.chat/#salt - about: Please ask and answer questions here. diff --git a/.github/ISSUE_TEMPLATE/tech-debt.md b/.github/ISSUE_TEMPLATE/tech-debt.md index 6761145a442..0fe65bff3c9 100644 --- a/.github/ISSUE_TEMPLATE/tech-debt.md +++ b/.github/ISSUE_TEMPLATE/tech-debt.md @@ -8,7 +8,7 @@ assignees: '' --- ### Description of the tech debt to be addressed, include links and screenshots - + ### Versions Report (Provided by running `salt --versions-report`. Please also mention any differences in master/minion versions.) diff --git a/.github/config.yml b/.github/config.yml index b89e3c822bd..1d916579c6c 100644 --- a/.github/config.yml +++ b/.github/config.yml @@ -11,18 +11,16 @@ newIssueWelcomeComment: > Also, check out some of our community resources including: - - [Community Wiki](https://github.com/saltstack/community/wiki) - [Salt’s Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html) - [Join our Community Discord](https://discord.com/invite/J7b7EscrAs) - - [IRC on LiberaChat](https://web.libera.chat/#salt) - [Salt Project YouTube channel](https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg) - - [Salt Project Twitch channel](https://www.twitch.tv/saltprojectoss) + - [Community Wiki](https://github.com/saltstack/community/wiki) There are lots of ways to get involved in our community. Every month, there are around a dozen opportunities to meet with other contributors and the Salt Core team and collaborate in real time. The best way to keep track is by subscribing to the Salt Community Events Calendar. - If you have additional questions, email us at saltproject@vmware.com. We’re glad + If you have additional questions, email us at saltproject.pdl@broadcom.com. We’re glad you’ve joined our community and look forward to doing awesome things with you! @@ -37,18 +35,16 @@ newPRWelcomeComment: > Also, check out some of our community resources including: - - [Community Wiki](https://github.com/saltstack/community/wiki) - [Salt’s Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html) - [Join our Community Discord](https://discord.com/invite/J7b7EscrAs) - - [IRC on LiberaChat](https://web.libera.chat/#salt) - [Salt Project YouTube channel](https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg) - - [Salt Project Twitch channel](https://www.twitch.tv/saltprojectoss) + - [Community Wiki](https://github.com/saltstack/community/wiki) There are lots of ways to get involved in our community. Every month, there are around a dozen opportunities to meet with other contributors and the Salt Core team and collaborate in real time. The best way to keep track is by subscribing to the Salt Community Events Calendar. - If you have additional questions, email us at saltproject@vmware.com. We’re glad + If you have additional questions, email us at saltproject.pdl@broadcom.com. We’re glad you’ve joined our community and look forward to doing awesome things with you! diff --git a/AUTHORS b/AUTHORS index e6d611cf2a9..7d645d49670 100644 --- a/AUTHORS +++ b/AUTHORS @@ -8,114 +8,28 @@ Whos Who in Salt The Man With the Plan ---------------------------- -Thomas S. Hatch is the main developer of Salt. He is the founder, owner, -maintainer and lead of the Salt project, as well as author of the majority -of the Salt code and documentation. +Thomas S. Hatch is the creator of Salt. He was the founder, owner, +maintainer that lead Salt project, as well as author of the majority +of initial Salt code and documentation. + +SaltStack, Inc. was acquired by VMware in 2020. In 2023, VMware was +acquired by Broadcom. + +The Salt Project core team of developers are employed by Broadcom. Documentation System ---------------------------- -The documentation system was put together by Seth House, much of the -documentation is being maintained by Seth. - -Developers ----------------------------- - -Aaron Bull Schaefer -Aaron Toponce -Andrew Hammond -Aditya Kulkarni -Alexander Pyatkin -Andre Sachs -Andrew Colin Kissa -Andrew Kuhnhausen -Antti Kaihola -archme -Brad Barden -Bret Palsson -Brian Wagner -C. R. Oldham -Carl Loa Odin -Carlo Pires -Chris Rebert -Chris Scheller -Christer Edwards -Clint Savage -Colton Myers -Corey Quinn -Corin Kochenower -Dan Garthwaite -Daniel Wallace -David Boucha -David Pravec -deutsche -Dmitry Kuzmenko -Doug Renn -Eivind Uggedal -epoelke@gmail.com -Eric Poelke -Erik Nolte -Evan Borgstrom -Forrest Alvarez -Fred Reimer -Henrik Holmboe -Gareth J. Greenaway -Jacob Albretsen -Jed Glazner -Jeff Bauer -Jeff Hutchins -Jeffrey C. Ollie -Jeff Schroeder -Johnny Bergström -Jonas Buckner -Jonathan Harker -Joseph Hall -Josmar Dias -Kent Tenney -lexual -Marat Shakirov -Marc Abramowitz -Martin Schnabel -Mathieu Le Marec - Pasquet -Matt Black -Matthew Printz -Matthias Teege -Maxim Burgerhout -Mickey Malone -Michael Steed -Mike Place -Mircea Ulinic -Mitch Anderson -Mostafa Hussein -Nathaniel Whiteinge -Nicolas Delaby -Nicole Thomas -Nigel Owen -Nitin Madhok -Oleg Anashkin -Pedro Algarvio -Peter Baumgartner -Pierre Carrier -Rhys Elsmore -Rafael Caricio -Robert Fielding -Sean Channel -Seth House -Seth Vidal -Stas Alekseev -Thibault Cohen -Thomas Schreiber -Thomas S Hatch -Tor Hveem -Travis Cline -Wieland Hoffmann +The initial documentation system was put together by Seth House. +Documentation is now primarily maintained by the Salt Project core team and +community members. Growing Community -------------------------------- -Salt is a rapidly growing project with a large community, to view all -contributors please check Github, this file can sometimes be out of date: +Salt is a rapidly growing project with a large community, and has had more than +2,400 contributors over the years. To view all contributors, please check Github: https://github.com/saltstack/salt/graphs/contributors diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index e7f1c331127..313038982c3 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -60,7 +60,7 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at -conduct@saltstack.com. +saltproject.pdl@broadcom.com. All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index c9c459ef558..8fac02740b6 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -8,7 +8,7 @@ ways you can help improve Salt: - Use Salt and report bugs with clear, detailed descriptions. - Join a `working group `__ to collaborate with other contributors. -- Answer questions on platforms like `IRC `__, +- Answer questions on platforms like the `community Discord `__, the `salt-users mailing list `__, `Server Fault `__, @@ -135,7 +135,7 @@ Then activate it: Sweet! Now you're ready to clone Salt so you can start hacking away! If you get stuck at any point, check out the resources at the beginning of -this guide. IRC and Discord are particularly helpful places to go. +this guide. Discord and GitHub Discussions are particularly helpful places to go. Get the source! @@ -631,7 +631,7 @@ your PR is submitted during the week you should be able to expect some kind of communication within that business day. If your tests are passing and we're not in a code freeze, ideally your code will be merged that week or month. If you haven't heard from your assigned reviewer, ping them -on GitHub, `irc `__, or Community Discord. +on GitHub or `Community Discord `__. It's likely that your reviewer will leave some comments that need addressing - it may be a style change, or you forgot a changelog entry, diff --git a/README.rst b/README.rst index aa8e408a126..63d4bf77568 100644 --- a/README.rst +++ b/README.rst @@ -6,18 +6,10 @@ :alt: PyPi Package Downloads :target: https://pypi.org/project/salt -.. image:: https://img.shields.io/lgtm/grade/python/github/saltstack/salt - :alt: PyPi Package Downloads - :target: https://lgtm.com/projects/g/saltstack/salt/context:python - .. image:: https://img.shields.io/badge/discord-SaltProject-blue.svg?logo=discord :alt: Salt Project Discord Community :target: https://discord.com/invite/J7b7EscrAs -.. image:: https://img.shields.io/twitch/status/saltprojectoss - :alt: Salt Project Twitch Channel - :target: https://www.twitch.tv/saltprojectoss - .. image:: https://img.shields.io/reddit/subreddit-subscribers/saltstack?style=social :alt: Salt Project subreddit :target: https://www.reddit.com/r/saltstack/ @@ -71,20 +63,21 @@ In addition to configuration management Salt can also: About our sponsors ================== -Salt powers VMware's `VMware Aria Automation Config`_ -(previously vRealize Automation SaltStack Config / SaltStack Enterprise), and can be found + +Salt powers VMware by Broadcom's `Tanzu Salt`_ +(previously Aria Automation Config / vRealize Automation SaltStack Config / SaltStack Enterprise), and can be found under the hood of products from Juniper, Cisco, Cloudflare, Nutanix, SUSE, and Tieto, to name a few. -The original sponsor of our community, SaltStack, was `acquired by VMware in 2020 `_. -The Salt Project remains an open source ecosystem that VMware supports and -contributes to. VMware ensures the code integrity and quality of the Salt +The original sponsor of our community, SaltStack, was acquired by VMware in 2020. +`VMware was later acquired by Broadcom in 2023 `__. +The Salt Project remains an open source ecosystem that Broadcom supports and +contributes to. Broadcom ensures the code integrity and quality of the Salt modules by acting as the official sponsor and manager of the Salt project. Many -of the core Salt Project contributors are also VMware employees. This team +of the core Salt Project contributors are also Broadcom employees. This team carefully reviews and enhances the Salt modules to ensure speed, quality, and security. - Download and install Salt ========================= Salt is tested and packaged to run on CentOS, Debian, RHEL, Ubuntu, MacOS, @@ -93,11 +86,11 @@ Windows, and more. Download Salt and get started now. See for more information. To download and install Salt, see: -* `The Salt install guide `_ -* `Salt Project repository `_ -* `Salt Project debian repository `_ -* `Salt Project redhat repository `_ +* `The Salt install guide `_ + * `Salt Project Repository: Linux (RPM) `__ - Where Salt ``rpm`` packages are officially stored and distributed. + * `Salt Project Repository: Linux (DEB) `__ - Where Salt ``deb`` packages are officially stored and distributed. + * `Salt Project Repository: GENERIC `__ - Where Salt Windows, macOS, etc. (non-rpm, non-deb) packages are officially stored and distributed. Technical support ================= @@ -155,11 +148,9 @@ Please be sure to review our `Code of Conduct `_. Also, check out some of our community resources including: -* `Salt Project Community Wiki `_ * `Salt Project Community Discord`_ -* `Salt Project: IRC on LiberaChat `_ * `Salt Project YouTube channel `_ -* `Salt Project Twitch channel `_ +* `Salt Project Community Notes and Wiki `_ There are lots of ways to get involved in our community. Every month, there are around a dozen opportunities to meet with other contributors and the Salt Core @@ -167,10 +158,9 @@ team and collaborate in real time. The best way to keep track is by subscribing to the **Salt Project Community Events Calendar** on the main ``_ website. -If you have additional questions, email us at saltproject@vmware.com or reach out +If you have additional questions, email us at saltproject.pdl@broadcom.com or reach out directly to the Community Discord. We'd be glad to have you join our community! - License ======= Salt is licensed under the Apache 2.0 license. Please @@ -183,9 +173,7 @@ A complete list of attributions and dependencies can be found here: `salt/DEPENDENCIES.md `_ .. _Salt Project Community Discord: https://discord.com/invite/J7b7EscrAs -.. _VMware Aria Automation Config: https://www.vmware.com/products/vrealize-automation/saltstack-config.html +.. _Tanzu Salt: https://www.vmware.com/products/app-platform/tanzu-salt .. _Latest Salt Documentation: https://docs.saltproject.io/en/latest/ .. _Open an issue: https://github.com/saltstack/salt/issues/new/choose .. _SECURITY.md: https://github.com/saltstack/salt/blob/master/SECURITY.md -.. _Calendar html: https://outlook.office365.com/owa/calendar/105f69bacd4541baa849529aed37eb2d@vmware.com/434ec2155b2b4cce90144c87f0dd03d56626754050155294962/calendar.html -.. _Calendar ics: https://outlook.office365.com/owa/calendar/105f69bacd4541baa849529aed37eb2d@vmware.com/434ec2155b2b4cce90144c87f0dd03d56626754050155294962/calendar.ics diff --git a/SUPPORT.rst b/SUPPORT.rst index 537039bf127..54b81d8881b 100644 --- a/SUPPORT.rst +++ b/SUPPORT.rst @@ -1,15 +1,8 @@ -Get SaltStack Support and Help -============================== +Get Salt Project Support and Help +================================= -**IRC Chat** - Join the vibrant, helpful and positive SaltStack chat room in -LiberaChat at #salt. There is no need to introduce yourself, or ask permission -to join in, just help and be helped! Make sure to wait for an answer, sometimes -it may take a few moments for someone to reply. - -``_ - -**SaltStack Slack** - Alongside IRC is our SaltStack Community Discord for the -SaltStack Working groups. Use the following link to request an invitation. +**Salt Project Discord** - Join the Salt Project Community Discord! +Use the following link to join the Discord server: ``_ @@ -20,13 +13,13 @@ anyone can help answer. Join the conversation! ``_ You may subscribe to the list without a Google account by emailing -salt-users+subscribe@googlegroups.com and you may post to the list by emailing -salt-users@googlegroups.com +``salt-users+subscribe@googlegroups.com`` and you may post to the list by emailing +``salt-users@googlegroups.com`` **Reporting Issues** - To report an issue with Salt, please follow the guidelines for filing bug reports: ``_ -**SaltStack Support** - If you need dedicated, prioritized support, please -consider a SaltStack Support package that fits your needs: -``_ +**Salt Project Support** - If you need dedicated, prioritized support, please +consider taking a look at the Enterprise product: +`Tanzu Salt `__ diff --git a/doc/_themes/saltstack/layout.html b/doc/_themes/saltstack/layout.html index 7589881f71f..4bec3e702f5 100644 --- a/doc/_themes/saltstack/layout.html +++ b/doc/_themes/saltstack/layout.html @@ -247,8 +247,8 @@

Community

- saltstack.org - Documentation + saltproject.io + Documentation
diff --git a/doc/_themes/saltstack2/layout.html b/doc/_themes/saltstack2/layout.html index e68b5909305..ef99aa2ebbd 100644 --- a/doc/_themes/saltstack2/layout.html +++ b/doc/_themes/saltstack2/layout.html @@ -290,7 +290,7 @@ {% if on_saltstack %} {# {% if [True, False]|random %} - + {% else %} {% endif %} #}--> diff --git a/doc/conf.py b/doc/conf.py index c31ea7d54eb..473ebbdc185 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -181,20 +181,6 @@ rst_prolog = """\ .. _`salt-announce`: https://groups.google.com/forum/#!forum/salt-announce .. _`salt-packagers`: https://groups.google.com/forum/#!forum/salt-packagers .. _`salt-discord`: https://discord.com/invite/J7b7EscrAs -.. |windownload| raw:: html - -

Python3 x86: Salt-Minion-{release}-x86-Setup.exe - | md5

- -

Python3 AMD64: Salt-Minion-{release}-AMD64-Setup.exe - | md5

- -.. |osxdownloadpy3| raw:: html - -

x86_64: salt-{release}-py3-x86_64.pkg - | md5

""".format( release=stripped_release diff --git a/doc/faq.rst b/doc/faq.rst index 25fef77f9ab..5ae6e55287d 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -30,7 +30,7 @@ SaltStack the company does make proprietary products which use Salt and its libr I think I found a bug! What should I do? ---------------------------------------- -The salt-users mailing list as well as the salt IRC channel can both be helpful +The salt-users mailing list as well as the Community Discord can both be helpful resources to confirm if others are seeing the issue and to assist with immediate debugging. diff --git a/doc/ref/configuration/delta_proxy.rst b/doc/ref/configuration/delta_proxy.rst index bce5f821c95..7e6a6813283 100644 --- a/doc/ref/configuration/delta_proxy.rst +++ b/doc/ref/configuration/delta_proxy.rst @@ -146,8 +146,8 @@ Before installing the delta proxy minion, ensure that: Install or upgrade Salt ----------------------- Ensure your Salt masters are running at least Salt version 3004. For instructions -on installing or upgrading Salt, see the `Salt install guide -`_. +on installing or upgrading Salt, see the +`Salt Install Guide `__. .. _delta-proxy-install: diff --git a/doc/ref/modules/index.rst b/doc/ref/modules/index.rst index 3231368c036..8e84861461c 100644 --- a/doc/ref/modules/index.rst +++ b/doc/ref/modules/index.rst @@ -539,8 +539,6 @@ the module using the following field lists: .. code-block:: text - :maintainer: Thomas Hatch - :maturity: new :depends: python-mysqldb :platform: all diff --git a/doc/topics/development/conventions/formulas.rst b/doc/topics/development/conventions/formulas.rst index 7e069d41ec9..a1491e49383 100644 --- a/doc/topics/development/conventions/formulas.rst +++ b/doc/topics/development/conventions/formulas.rst @@ -221,14 +221,10 @@ The best way to create new Formula repositories for now is to create a repository in your own account on GitHub and notify a SaltStack employee when it is ready. We will add you to the Contributors team on the `saltstack-formulas`_ organization and help you transfer the repository over. -Ping a SaltStack employee on IRC (`#salt`_ on LiberaChat), join the -``#formulas`` channel on the `salt-discord`_ (bridged to ``#saltstack-formulas`` -on LiberaChat) or send an email to the `salt-users`_ mailing list. Note that -IRC logs are available at http://ngxbot.nginx.org/logs/%23salt/ and archives -for FreeNode (up to mid-June 2021) https://logbot-archive.s3.amazonaws.com/freenode/salt.gz -and https://logbot-archive.s3.amazonaws.com/freenode/saltstack-formulas.gz. +Join the ``#formulas`` channel on the `salt-discord`_ +or send an email to the `salt-users`_ mailing list. -There are a lot of repositories in that organization! Team members can manage +Team members can manage which repositories they are subscribed to on GitHub's watching page: https://github.com/watching. @@ -246,7 +242,7 @@ your pull request has stayed open for more than a couple days feel free to "selfie-merge" your own pull request. .. _`at-mention`: https://help.github.com/en/github/writing-on-github/basic-writing-and-formatting-syntax#mentioning-people-and-teams -.. _`#salt`: https://web.libera.chat/#salt +.. _`#salt`: https://discord.com/invite/J7b7EscrAs Style ----- diff --git a/doc/topics/development/conventions/style.rst b/doc/topics/development/conventions/style.rst index 1772d6209ca..30d814d47b2 100644 --- a/doc/topics/development/conventions/style.rst +++ b/doc/topics/development/conventions/style.rst @@ -97,7 +97,7 @@ When adding a new function or state, where possible try to use a print(msg) If you are uncertain what version should be used, either consult a core -developer in IRC or bring this up when opening your :ref:`pull request +developer in the Community Discord or bring this up when opening your :ref:`pull request ` and a core developer will let you know what version to add. Typically this will be the next element in the `periodic table `_. diff --git a/pkg/old/suse/salt-api.spec b/pkg/old/suse/salt-api.spec index f4675fc2310..361448e9536 100644 --- a/pkg/old/suse/salt-api.spec +++ b/pkg/old/suse/salt-api.spec @@ -20,7 +20,7 @@ Version: 0.8.3 Release: 0 License: Apache-2.0 Summary: The api for Salt a parallel remote execution system -Url: http://saltstack.org/ +Url: http://saltproject.io/ Group: System/Monitoring Source0: http://pypi.python.org/packages/source/s/%{name}/%{name}-%{version}.tar.gz Source1: salt-api diff --git a/pkg/old/suse/salt.spec b/pkg/old/suse/salt.spec index ecc3442b907..bc7f85a8993 100644 --- a/pkg/old/suse/salt.spec +++ b/pkg/old/suse/salt.spec @@ -41,7 +41,7 @@ Release: 0 Summary: A parallel remote execution system License: Apache-2.0 Group: System/Monitoring -Url: http://saltstack.org/ +Url: http://saltproject.io/ Source0: http://pypi.python.org/packages/source/s/%{name}/%{name}-%{version}.tar.gz Source1: README.SUSE Source2: salt-tmpfiles.d diff --git a/pkg/rpm/salt.bash b/pkg/rpm/salt.bash index 35fe0695dbe..6363fe14271 100644 --- a/pkg/rpm/salt.bash +++ b/pkg/rpm/salt.bash @@ -1,6 +1,3 @@ -# written by David Pravec -# - feel free to /msg alekibango on IRC if you want to talk about this file - # TODO: check if --config|-c was used and use configured config file for queries # TODO: solve somehow completion for salt -G pythonversion:[tab] # (not sure what to do with lists) diff --git a/salt/modules/tls.py b/salt/modules/tls.py index 2cc3c09119a..f85370cc902 100644 --- a/salt/modules/tls.py +++ b/salt/modules/tls.py @@ -1982,7 +1982,7 @@ if __name__ == "__main__": L="Centerville", O="SaltStack", OU=None, - emailAddress="test_system@saltstack.org", + emailAddress="test_system@saltproject.io", ) create_ca_signed_cert("koji", "test_system") create_pkcs12("koji", "test_system", passphrase="test") diff --git a/salt/renderers/stateconf.py b/salt/renderers/stateconf.py index d487f2d4e67..cad4dd387a5 100644 --- a/salt/renderers/stateconf.py +++ b/salt/renderers/stateconf.py @@ -6,7 +6,7 @@ A flexible renderer that takes a templating engine and a data format :platform: all """ -# See http://docs.saltstack.org/en/latest/ref/renderers/all/salt.renderers.stateconf.html +# See http://docs.saltproject.io/en/latest/ref/renderers/all/salt.renderers.stateconf.html # for a guide to using this module. # # FIXME: I really need to review and simplify this renderer, it's getting out of hand! diff --git a/tests/pytests/pkg/download/test_pkg_download.py b/tests/pytests/pkg/download/test_pkg_download.py index ee44dd5cb6b..d331d527e6f 100644 --- a/tests/pytests/pkg/download/test_pkg_download.py +++ b/tests/pytests/pkg/download/test_pkg_download.py @@ -198,7 +198,7 @@ def setup_redhat_family( # It contains the gpg key url so we don't need to download it here salt_repo_url = "https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo" repo_file = pytest.helpers.download_file( - salt_repo_url, downloads_path / f"salt.repo" + salt_repo_url, downloads_path / "salt.repo" ) commands = [ diff --git a/tests/support/pkg.py b/tests/support/pkg.py index 8c6d191ba6a..db2361bf4de 100644 --- a/tests/support/pkg.py +++ b/tests/support/pkg.py @@ -783,7 +783,7 @@ class SaltPkgInstall: elif self.file_ext == "msi": win_pkg = f"Salt-Minion-{self.prev_version}-Py3-AMD64.{self.file_ext}" else: - log.debug(f"Unknown windows file extension: {self.file_ext}") + log.debug("Unknown windows file extension: %s", self.file_ext) win_pkg_url = ( f"{root_url}/saltproject-generic/windows/{major_ver}/{win_pkg}" diff --git a/tests/support/win_installer.py b/tests/support/win_installer.py index c7efe2d893b..846245194b0 100644 --- a/tests/support/win_installer.py +++ b/tests/support/win_installer.py @@ -26,7 +26,7 @@ def latest_installer_name(arch="AMD64", **kwargs): # This is where windows packages are found # Each version is in its own directory, so we need to list the directories # and use the last one as the latest - html_response = requests.get(REPO) + html_response = requests.get(REPO, timeout=60) versions = []