From 19f28fc4becb2bffaac2de42888a0ce88c5facf7 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Thu, 25 Aug 2022 10:13:23 -0600 Subject: [PATCH] salt 3005 Closes #108914. Signed-off-by: Sean Molenaar <1484494+SMillerDev@users.noreply.github.com> Signed-off-by: Rui Chen Signed-off-by: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> --- Formula/salt.rb | 49 ++++++++------- pypi_formula_mappings.json | 124 +------------------------------------ 2 files changed, 26 insertions(+), 147 deletions(-) diff --git a/Formula/salt.rb b/Formula/salt.rb index 9871ba1502d..6e95d1f2b53 100644 --- a/Formula/salt.rb +++ b/Formula/salt.rb @@ -3,10 +3,9 @@ class Salt < Formula desc "Dynamic infrastructure communication bus" homepage "https://saltproject.io/" - url "https://files.pythonhosted.org/packages/78/47/0acfc5d43fcf4b01c3f650ce884525dd2330b8827364e4509819f7e925d3/salt-3004.2.tar.gz" - sha256 "2fa644f6200d4e36b55846cb372b6e67b6ca0fbec0697f1d8d73e771b665ed70" + url "https://files.pythonhosted.org/packages/c1/8b/f21efb024adbb6929cba84040882bf9fd6427fd786dd0596e7e23a9cf717/salt-3005.tar.gz" + sha256 "1d200c45b88046178ea56fb5a75726dc620cc5e51411076a04df80ff52f79cd4" license "Apache-2.0" - revision 2 head "https://github.com/saltstack/salt.git", branch: "master" bottle do @@ -35,9 +34,6 @@ class Salt < Formula end # Homebrew installs optional dependencies: pycryptodome, pygit2 - # - # Please do not add PyObjC (pyobjc* resources) since it causes broken linkage - # https://github.com/Homebrew/homebrew-core/pull/52835#issuecomment-617502578 resource "apache-libcloud" do url "https://files.pythonhosted.org/packages/b6/a0/707142df518a602a2e36f9aa4f6dcc2cc9981843ffb7ba1207f7a084819d/apache-libcloud-2.5.0.tar.gz" @@ -45,8 +41,8 @@ class Salt < Formula end resource "certifi" do - url "https://files.pythonhosted.org/packages/6d/78/f8db8d57f520a54f0b8a438319c342c61c22759d8f9a1cd2e2180b5e5ea9/certifi-2021.5.30.tar.gz" - sha256 "2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee" + url "https://files.pythonhosted.org/packages/07/10/75277f313d13a2b74fc56e29239d5c840c2bf09f17bf25c02b35558812c6/certifi-2022.5.18.1.tar.gz" + sha256 "9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7" end resource "cffi" do @@ -125,8 +121,8 @@ class Salt < Formula end resource "Jinja2" do - url "https://files.pythonhosted.org/packages/4f/e7/65300e6b32e69768ded990494809106f87da1d436418d5f1367ed3966fd7/Jinja2-2.11.3.tar.gz" - sha256 "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6" + url "https://files.pythonhosted.org/packages/1f/93/99a76d0fa1a8fc14442a6421abee323f8d15964979336eabd2a1834e9118/Jinja2-3.1.0.tar.gz" + sha256 "a2f09a92f358b96b5f6ca6ecb4502669c4acb55d8733bbb2b2c9c4af5564c605" end resource "linode-python" do @@ -140,8 +136,8 @@ class Salt < Formula end resource "MarkupSafe" do - url "https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094/MarkupSafe-1.1.1.tar.gz" - sha256 "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b" + url "https://files.pythonhosted.org/packages/bf/10/ff66fea6d1788c458663a84d88787bae15d45daa16f6b3ef33322a51fc7e/MarkupSafe-2.0.1.tar.gz" + sha256 "594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a" end resource "more-itertools" do @@ -170,8 +166,8 @@ class Salt < Formula end resource "pycparser" do - url "https://files.pythonhosted.org/packages/68/9e/49196946aee219aead1290e00d1e7fdeab8567783e83e1b9ab5585e6206a/pycparser-2.19.tar.gz" - sha256 "a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3" + url "https://files.pythonhosted.org/packages/5e/0b/95d387f5f4433cb0f53ff7ad859bd2c6051051cebbb564f139a999ab46de/pycparser-2.21.tar.gz" + sha256 "e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206" end resource "pycryptodome" do @@ -200,13 +196,13 @@ class Salt < Formula end resource "python-gnupg" do - url "https://files.pythonhosted.org/packages/a7/4e/a7078f08a42b2563169ef20bc74d136015f1f3d0dbfa229070cf8ed4b686/python-gnupg-0.4.4.tar.gz" - sha256 "45daf020b370bda13a1429c859fcdff0b766c0576844211446f9266cae97fb0e" + url "https://files.pythonhosted.org/packages/b1/90/75e15ead9693028c05fc7abd25c756c0d1da27bf04a27d6f5c4139d8ee10/python-gnupg-0.4.8.tar.gz" + sha256 "b64de1ae5cedf872b437201a566fa2c62ce0c95ea2e30177eb53aee1258507d7" end resource "pytz" do - url "https://files.pythonhosted.org/packages/b0/61/eddc6eb2c682ea6fd97a7e1018a6294be80dba08fa28e7a3570148b4612d/pytz-2021.1.tar.gz" - sha256 "83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da" + url "https://files.pythonhosted.org/packages/2f/5f/a0f653311adff905bbcaa6d3dfaf97edcf4d26138393c6ccd37a484851fb/pytz-2022.1.tar.gz" + sha256 "1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7" end resource "PyYAML" do @@ -214,6 +210,11 @@ class Salt < Formula sha256 "607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e" end + resource "pyzmq" do + url "https://files.pythonhosted.org/packages/36/80/50962c33a3ad813b086fe2bf023bb8b79cb232f8e15b1b54a4d5b05b62ff/pyzmq-23.2.0.tar.gz" + sha256 "a51f12a8719aad9dcfb55d456022f16b90abc8dde7d3ca93ce3120b40e3fa169" + end + resource "requests" do url "https://files.pythonhosted.org/packages/6b/47/c14abc08432ab22dc18b9892252efaf005ab44066de871e72a38d6af464b/requests-2.25.1.tar.gz" sha256 "27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804" @@ -256,10 +257,6 @@ class Salt < Formula def install ENV["SWIG_FEATURES"]="-I#{Formula["openssl@1.1"].opt_include}" - xy = Language::Python.major_minor_version Formula["python@3.10"].bin/"python3.10" - - inreplace buildpath/"requirements/static/pkg/py#{xy}/darwin.txt", /^pyobjc.*$/, "" - inreplace buildpath/"requirements/darwin.txt", "-r pyobjc.txt", "" virtualenv_install_with_resources @@ -271,11 +268,15 @@ class Salt < Formula <<~EOS Sample configuration files have been placed in #{etc}/saltstack. Saltstack will not use these by default. - - Homebrew's installation does not include PyObjC. EOS end + service do + run [opt_bin/"salt-minion", "--config-dir=#{etc}/saltstack", "--pid-file=#{var}/run/salt-minion.pid"] + log_path var/"log/salt-minion.log" + error_log_path var/"log/salt-minion.log" + end + test do output = shell_output("#{bin}/salt --config-dir=#{testpath} --log-file=/dev/null --versions") assert_match "Salt: #{version}", output diff --git a/pypi_formula_mappings.json b/pypi_formula_mappings.json index d694086bf99..33705718c1a 100644 --- a/pypi_formula_mappings.json +++ b/pypi_formula_mappings.json @@ -382,129 +382,7 @@ }, "salt": { "extra_packages": ["pycryptodome", "pygit2"], - "exclude_packages": [ - "pyobjc-core", - "pyobjc-framework-Accounts", - "pyobjc-framework-AddressBook", - "pyobjc-framework-AdSupport", - "pyobjc-framework-AppleScriptKit", - "pyobjc-framework-AppleScriptObjC", - "pyobjc-framework-ApplicationServices", - "pyobjc-framework-AuthenticationServices", - "pyobjc-framework-AutomaticAssessmentConfiguration", - "pyobjc-framework-Automator", - "pyobjc-framework-AVFoundation", - "pyobjc-framework-AVKit", - "pyobjc-framework-BusinessChat", - "pyobjc-framework-CalendarStore", - "pyobjc-framework-CFNetwork", - "pyobjc-framework-CloudKit", - "pyobjc-framework-Cocoa", - "pyobjc-framework-Collaboration", - "pyobjc-framework-ColorSync", - "pyobjc-framework-Contacts", - "pyobjc-framework-ContactsUI", - "pyobjc-framework-CoreAudio", - "pyobjc-framework-CoreAudioKit", - "pyobjc-framework-CoreBluetooth", - "pyobjc-framework-CoreData", - "pyobjc-framework-CoreHaptics", - "pyobjc-framework-CoreLocation", - "pyobjc-framework-CoreMedia", - "pyobjc-framework-CoreMediaIO", - "pyobjc-framework-CoreML", - "pyobjc-framework-CoreMotion", - "pyobjc-framework-CoreServices", - "pyobjc-framework-CoreSpotlight", - "pyobjc-framework-CoreText", - "pyobjc-framework-CoreWLAN", - "pyobjc-framework-CryptoTokenKit", - "pyobjc-framework-DeviceCheck", - "pyobjc-framework-DictionaryServices", - "pyobjc-framework-DiscRecording", - "pyobjc-framework-DiscRecordingUI", - "pyobjc-framework-DiskArbitration", - "pyobjc-framework-DVDPlayback", - "pyobjc-framework-EventKit", - "pyobjc-framework-ExceptionHandling", - "pyobjc-framework-ExecutionPolicy", - "pyobjc-framework-ExternalAccessory", - "pyobjc-framework-FileProvider", - "pyobjc-framework-FileProviderUI", - "pyobjc-framework-FinderSync", - "pyobjc-framework-FSEvents", - "pyobjc-framework-GameCenter", - "pyobjc-framework-GameController", - "pyobjc-framework-GameKit", - "pyobjc-framework-GameplayKit", - "pyobjc-framework-ImageCaptureCore", - "pyobjc-framework-IMServicePlugIn", - "pyobjc-framework-InputMethodKit", - "pyobjc-framework-InstallerPlugins", - "pyobjc-framework-InstantMessage", - "pyobjc-framework-Intents", - "pyobjc-framework-InterfaceBuilderKit", - "pyobjc-framework-IOSurface", - "pyobjc-framework-iTunesLibrary", - "pyobjc-framework-LatentSemanticMapping", - "pyobjc-framework-LaunchServices", - "pyobjc-framework-libdispatch", - "pyobjc-framework-LinkPresentation", - "pyobjc-framework-LocalAuthentication", - "pyobjc-framework-MapKit", - "pyobjc-framework-MediaAccessibility", - "pyobjc-framework-MediaLibrary", - "pyobjc-framework-MediaPlayer", - "pyobjc-framework-MediaToolbox", - "pyobjc-framework-Message", - "pyobjc-framework-Metal", - "pyobjc-framework-MetalKit", - "pyobjc-framework-ModelIO", - "pyobjc-framework-MultipeerConnectivity", - "pyobjc-framework-NaturalLanguage", - "pyobjc-framework-NetFS", - "pyobjc-framework-Network", - "pyobjc-framework-NetworkExtension", - "pyobjc-framework-NotificationCenter", - "pyobjc-framework-OpenDirectory", - "pyobjc-framework-OSAKit", - "pyobjc-framework-OSLog", - "pyobjc-framework-PencilKit", - "pyobjc-framework-Photos", - "pyobjc-framework-PhotosUI", - "pyobjc-framework-PreferencePanes", - "pyobjc-framework-PubSub", - "pyobjc-framework-PushKit", - "pyobjc-framework-QTKit", - "pyobjc-framework-Quartz", - "pyobjc-framework-QuickLookThumbnailing", - "pyobjc-framework-SafariServices", - "pyobjc-framework-SceneKit", - "pyobjc-framework-ScreenSaver", - "pyobjc-framework-ScriptingBridge", - "pyobjc-framework-SearchKit", - "pyobjc-framework-Security", - "pyobjc-framework-SecurityFoundation", - "pyobjc-framework-SecurityInterface", - "pyobjc-framework-ServerNotification", - "pyobjc-framework-ServiceManagement", - "pyobjc-framework-Social", - "pyobjc-framework-SoundAnalysis", - "pyobjc-framework-Speech", - "pyobjc-framework-SpriteKit", - "pyobjc-framework-StoreKit", - "pyobjc-framework-SyncServices", - "pyobjc-framework-SystemConfiguration", - "pyobjc-framework-SystemExtensions", - "pyobjc-framework-UserNotifications", - "pyobjc-framework-VideoSubscriberAccount", - "pyobjc-framework-VideoToolbox", - "pyobjc-framework-Vision", - "pyobjc-framework-WebKit", - "pyobjc-framework-XgridFoundation", - "pyobjc", - "six" - ] + "exclude_packages": ["six"] }, "rtv": { "exclude_packages": ["six"]