diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 94b810b2779..107090c95c1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -142,29 +142,25 @@ repos: - id: pip-tools-compile alias: compile-pkg-darwin-3.9-zmq-requirements name: Darwin Packaging Py3.9 ZeroMQ Requirements - files: ^(requirements/((base|zeromq|crypto|darwin|pyobjc)\.txt|static/pkg/(darwin\.in|py3\.9/darwin\.txt)))$ + files: ^(requirements/((base|zeromq|crypto|darwin)\.txt|static/pkg/(darwin\.in|py3\.9/darwin\.txt)))$ pass_filenames: false args: - -v - --py-version=3.9 - --platform=darwin - --include=requirements/darwin.txt - - --include=requirements/pyobjc.txt - - --passthrough-line-from-input=^pyobjc(.*)$ - requirements/static/pkg/darwin.in - id: pip-tools-compile alias: compile-pkg-darwin-3.10-zmq-requirements name: Darwin Packaging Py3.10 ZeroMQ Requirements - files: ^(requirements/((base|zeromq|crypto|darwin|pyobjc)\.txt|static/pkg/(darwin\.in|py3\.10/darwin\.txt)))$ + files: ^(requirements/((base|zeromq|crypto|darwin)\.txt|static/pkg/(darwin\.in|py3\.10/darwin\.txt)))$ pass_filenames: false args: - -v - --py-version=3.10 - --platform=darwin - --include=requirements/darwin.txt - - --include=requirements/pyobjc.txt - - --passthrough-line-from-input=^pyobjc(.*)$ - requirements/static/pkg/darwin.in - id: pip-tools-compile @@ -525,36 +521,32 @@ repos: - id: pip-tools-compile alias: compile-ci-darwin-py3.9-zmq-requirements name: Darwin CI Py3.9 ZeroMQ Requirements - files: ^(pkg/osx/(req|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(darwin|common)\.in|pkg/py3\.9/darwin\.txt)))$ + files: ^(requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(darwin|common)\.in|pkg/py3\.9/darwin\.txt)))$ pass_filenames: false args: - -v - --py-version=3.9 - --platform=darwin - --include=requirements/darwin.txt - - --include=requirements/pyobjc.txt - --include=requirements/pytest.txt - --include=requirements/static/pkg/darwin.in - --include=requirements/static/ci/common.in - - --passthrough-line-from-input=^pyobjc(.*)$ - --pip-args=--constraint=requirements/static/pkg/py{py_version}/darwin.txt - requirements/static/ci/darwin.in - id: pip-tools-compile alias: compile-ci-darwin-py3.10-zmq-requirements name: Darwin CI Py3.10 ZeroMQ Requirements - files: ^(pkg/osx/(req|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(darwin|common)\.in|pkg/py3\.10/darwin\.txt)))$ + files: ^(requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(darwin|common)\.in|pkg/py3\.10/darwin\.txt)))$ pass_filenames: false args: - -v - --py-version=3.10 - --platform=darwin - --include=requirements/darwin.txt - - --include=requirements/pyobjc.txt - --include=requirements/pytest.txt - --include=requirements/static/pkg/darwin.in - --include=requirements/static/ci/common.in - - --passthrough-line-from-input=^pyobjc(.*)$ - --pip-args=--constraint=requirements/static/pkg/py{py_version}/darwin.txt - requirements/static/ci/darwin.in diff --git a/changelog/62372.fixed b/changelog/62372.fixed new file mode 100644 index 00000000000..1d460b9d0e6 --- /dev/null +++ b/changelog/62372.fixed @@ -0,0 +1 @@ +Fix use of random shuffle and sample functions as Jinja filters diff --git a/changelog/62381.added b/changelog/62381.added new file mode 100644 index 00000000000..8bea04f2ea4 --- /dev/null +++ b/changelog/62381.added @@ -0,0 +1 @@ +Add " python" subcommand to allow execution or arbitrary scripts via bundled Python runtime diff --git a/changelog/62400.fixed b/changelog/62400.fixed new file mode 100644 index 00000000000..290866b1f53 --- /dev/null +++ b/changelog/62400.fixed @@ -0,0 +1 @@ +Update all platforms to use pycparser 2.21 or greater for Py 3.9 or higher, fixes fips fault with openssl v3.x diff --git a/changelog/62432.removed b/changelog/62432.removed new file mode 100644 index 00000000000..b696136a208 --- /dev/null +++ b/changelog/62432.removed @@ -0,0 +1,5 @@ +Removed the PyObjC dependency. + +This addresses problems with building a one dir build for macOS. +It became problematic because depending on the macOS version, it pulls different dependencies, and we would either have to build a macos onedir for each macOS supported release, or ship a crippled onedir(because it would be tied to the macOS version where the onedir was built). +Since it's currently not being used, it's removed. diff --git a/doc/ref/clients/index.rst b/doc/ref/clients/index.rst index ff0b8659b36..f79005c8fdd 100644 --- a/doc/ref/clients/index.rst +++ b/doc/ref/clients/index.rst @@ -10,6 +10,14 @@ These entry points are often referred to as ``*Client()`` APIs. Each client accesses different parts of Salt, either from the master or from a minion. Each client is detailed below. +.. note:: + For Tiamat-bundled Salt distribution, you need to use the bundled Python runtime + as the system Python won't be able to access Salt internals. + + To execute scripts via bundled Python runtime, either run the script with + ``/path/to/salt python script.py`` or use ``#!/path/to/salt python`` `shebang `_ + + .. seealso:: There are many ways to access Salt programmatically. Salt can be used from CLI scripts as well as via a REST interface. diff --git a/requirements/darwin.txt b/requirements/darwin.txt index fb28b6ea4af..027322ef5f3 100644 --- a/requirements/darwin.txt +++ b/requirements/darwin.txt @@ -1,7 +1,6 @@ # Darwin source distribution requirements -r zeromq.txt --r pyobjc.txt apache-libcloud>=2.4.0 backports.ssl_match_hostname>=3.7.0.1; python_version < '3.7' @@ -12,7 +11,7 @@ idna>=2.8 linode-python>=1.1.1 mako>=1.0.7 pyasn1>=0.4.8 -pycparser>=2.19 +pycparser>=2.21 pyopenssl>=19.0.0 python-dateutil>=2.8.0 python-gnupg>=0.4.4 diff --git a/requirements/pyobjc.txt b/requirements/pyobjc.txt deleted file mode 100644 index f0dcc6f1fbd..00000000000 --- a/requirements/pyobjc.txt +++ /dev/null @@ -1,137 +0,0 @@ -# pyobjc requirements for darwin -# This may need to be updated from time to time as new frameworks are added to -# newer releases of macOS -pyobjc-core==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-accessibility==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-accounts==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-addressbook==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-adservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-adsupport==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-applescriptkit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-applescriptobjc==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-applicationservices==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-apptrackingtransparency==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-authenticationservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-automaticassessmentconfiguration==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-automator==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-avfoundation==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "16.0" -pyobjc-framework-avkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-businesschat==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-calendarstore==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-callkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-cfnetwork==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-classkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-cloudkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-cocoa==7.2 -pyobjc-framework-collaboration==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-colorsync==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-contacts==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-contactsui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-coreaudio==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-coreaudiokit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-corebluetooth==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-coredata==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-corehaptics==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-corelocation==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-coremedia==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-coremediaio==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-coremidi==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-coreml==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-coremotion==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-coreservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-corespotlight==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-coretext==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-corewlan==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-cryptotokenkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-devicecheck==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-dictionaryservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-discrecording==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-discrecordingui==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-diskarbitration==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-dvdplayback==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-eventkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-exceptionhandling==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-executionpolicy==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-externalaccessory==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-fileprovider==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-fileproviderui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-findersync==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-fsevents==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-gamecenter==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-gamecontroller==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-gamekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-gameplaykit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-imagecapturecore==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-imserviceplugin==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-inputmethodkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-installerplugins==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-instantmessage==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-intents==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "16.0" -pyobjc-framework-interfacebuilderkit==7.2; platform_release >= "9.0" and platform_release < "11.0" and sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-iosurface==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-ituneslibrary==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-kernelmanagement==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-latentsemanticmapping==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-launchservices==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-libdispatch==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-linkpresentation==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-localauthentication==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-mapkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-mediaaccessibility==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-medialibrary==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-mediaplayer==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "16.0" -pyobjc-framework-mediatoolbox==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-message==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release < "13.0" -pyobjc-framework-metal==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-metalkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-metalperformanceshaders==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-metalperformanceshadersgraph==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-mlcompute==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-modelio==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-multipeerconnectivity==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-naturallanguage==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-netfs==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-network==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-networkextension==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-notificationcenter==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-opendirectory==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-osakit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-oslog==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-passkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-pencilkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-photos==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-photosui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-preferencepanes==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-pubsub==7.2; platform_release >= "9.0" and platform_release < "18.0" and sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-pushkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-quartz==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-quicklookthumbnailing==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-replaykit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-safariservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-scenekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-screensaver==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-screentime==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-scriptingbridge==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-searchkit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-security==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-securityfoundation==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-securityinterface==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-servernotification==7.2; platform_release >= "10.0" and platform_release < "13.0" and sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-servicemanagement==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-social==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-soundanalysis==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-speech==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-spritekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-storekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-syncservices==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-systemconfiguration==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-systemextensions==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-uniformtypeidentifiers==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-usernotifications==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-usernotificationsui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-videosubscriberaccount==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-videotoolbox==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-virtualization==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-vision==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-webkit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc==7.2; sys_platform == "darwin" and python_version >= "3.7" diff --git a/requirements/static/ci/common.in b/requirements/static/ci/common.in index 750c2d0f237..fee1da323b5 100644 --- a/requirements/static/ci/common.in +++ b/requirements/static/ci/common.in @@ -31,6 +31,7 @@ moto>=2.0.0 ; python_version >= '3.6' napalm; sys_platform != 'win32' and python_version > '3.6' and python_version < '3.10' paramiko>=2.10.1; sys_platform != 'win32' and sys_platform != 'darwin' passlib>=1.7.2; sys_platform != 'win32' +pycparser>=2.21; python_version >= '3.9' pycurl>=7.43.0.5; python_version <= '3.9' pycurl==7.44.1; python_version >= '3.10' pyinotify>=0.9.6; sys_platform != 'win32' and sys_platform != 'darwin' and platform_system != "openbsd" diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 273cd0b993c..7bd9224a858 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -649,8 +649,11 @@ pyasn1==0.4.8 # pyasn1-modules # rsa # smbprotocol -pycparser==2.19 - # via cffi +pycparser==2.21 ; python_version >= "3.9" + # via + # -r requirements/static/ci/common.in + # -r requirements/static/pkg/linux.in + # cffi pycryptodomex==3.10.1 # via -r requirements/crypto.txt pycurl==7.44.1 ; python_version >= "3.10" diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index e1e817a22f9..508a987489d 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.10/darwin.txt --pip-args='--constraint=requirements/static/pkg/py3.10/darwin.txt' requirements/darwin.txt requirements/pyobjc.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/darwin.in requirements/static/pkg/darwin.in +# pip-compile --output-file=requirements/static/ci/py3.10/darwin.txt --pip-args='--constraint=requirements/static/pkg/py3.10/darwin.txt' requirements/darwin.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/darwin.in requirements/static/pkg/darwin.in # adal==1.2.5 # via @@ -649,9 +649,10 @@ pyasn1==0.4.8 # -r requirements/darwin.txt # pyasn1-modules # rsa -pycparser==2.19 +pycparser==2.21 ; python_version >= "3.9" # via # -r requirements/darwin.txt + # -r requirements/static/ci/common.in # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt @@ -873,138 +874,3 @@ zc.lockfile==2.0 # The following packages are considered to be unsafe in a requirements file: # setuptools -# Passthrough dependencies from requirements/pyobjc.txt -pyobjc-core==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-accessibility==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-accounts==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-addressbook==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-adservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-adsupport==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-applescriptkit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-applescriptobjc==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-applicationservices==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-apptrackingtransparency==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-authenticationservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-automaticassessmentconfiguration==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-automator==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-avfoundation==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "16.0" -pyobjc-framework-avkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-businesschat==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-calendarstore==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-callkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-cfnetwork==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-classkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-cloudkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-cocoa==7.2 -pyobjc-framework-collaboration==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-colorsync==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-contacts==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-contactsui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-coreaudio==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-coreaudiokit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-corebluetooth==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-coredata==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-corehaptics==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-corelocation==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-coremedia==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-coremediaio==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-coremidi==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-coreml==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-coremotion==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-coreservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-corespotlight==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-coretext==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-corewlan==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-cryptotokenkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-devicecheck==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-dictionaryservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-discrecording==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-discrecordingui==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-diskarbitration==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-dvdplayback==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-eventkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-exceptionhandling==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-executionpolicy==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-externalaccessory==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-fileprovider==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-fileproviderui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-findersync==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-fsevents==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-gamecenter==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-gamecontroller==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-gamekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-gameplaykit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-imagecapturecore==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-imserviceplugin==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-inputmethodkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-installerplugins==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-instantmessage==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-intents==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "16.0" -pyobjc-framework-interfacebuilderkit==7.2; platform_release >= "9.0" and platform_release < "11.0" and sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-iosurface==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-ituneslibrary==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-kernelmanagement==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-latentsemanticmapping==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-launchservices==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-libdispatch==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-linkpresentation==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-localauthentication==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-mapkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-mediaaccessibility==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-medialibrary==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-mediaplayer==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "16.0" -pyobjc-framework-mediatoolbox==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-message==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release < "13.0" -pyobjc-framework-metal==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-metalkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-metalperformanceshaders==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-metalperformanceshadersgraph==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-mlcompute==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-modelio==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-multipeerconnectivity==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-naturallanguage==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-netfs==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-network==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-networkextension==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-notificationcenter==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-opendirectory==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-osakit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-oslog==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-passkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-pencilkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-photos==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-photosui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-preferencepanes==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-pubsub==7.2; platform_release >= "9.0" and platform_release < "18.0" and sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-pushkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-quartz==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-quicklookthumbnailing==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-replaykit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-safariservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-scenekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-screensaver==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-screentime==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-scriptingbridge==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-searchkit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-security==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-securityfoundation==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-securityinterface==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-servernotification==7.2; platform_release >= "10.0" and platform_release < "13.0" and sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-servicemanagement==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-social==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-soundanalysis==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-speech==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-spritekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-storekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-syncservices==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-systemconfiguration==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-systemextensions==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-uniformtypeidentifiers==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-usernotifications==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-usernotificationsui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-videosubscriberaccount==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-videotoolbox==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-virtualization==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-vision==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-webkit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc==7.2; sys_platform == "darwin" and python_version >= "3.7" diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index bee04d5f8ed..30211a1861c 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -643,8 +643,11 @@ pyasn1==0.4.8 # via # pyasn1-modules # rsa -pycparser==2.17 - # via cffi +pycparser==2.21 ; python_version >= "3.9" + # via + # -r requirements/static/ci/common.in + # -r requirements/static/pkg/linux.in + # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt pycurl==7.44.1 ; python_version >= "3.10" diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 36df329aebf..474ea9e7d10 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -644,8 +644,11 @@ pyasn1==0.4.8 # via # pyasn1-modules # rsa -pycparser==2.17 - # via cffi +pycparser==2.21 ; python_version >= "3.9" + # via + # -r requirements/static/ci/common.in + # -r requirements/static/pkg/freebsd.in + # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt pycurl==7.44.1 ; python_version >= "3.10" diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index b4a7f9c7197..389f4bd9281 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -641,8 +641,11 @@ pyasn1==0.4.8 # rsa pycodestyle==2.5.0 # via saltpylint -pycparser==2.20 - # via cffi +pycparser==2.21 ; python_version >= "3.9" + # via + # -r requirements/static/ci/common.in + # -r requirements/static/pkg/linux.in + # cffi pycryptodomex==3.10.1 # via -r requirements/crypto.txt pycurl==7.44.1 ; python_version >= "3.10" diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index fae0cfd7e80..c063a4e00e8 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -660,8 +660,11 @@ pyasn1==0.4.8 # via # pyasn1-modules # rsa -pycparser==2.17 - # via cffi +pycparser==2.21 ; python_version >= "3.9" + # via + # -r requirements/static/ci/common.in + # -r requirements/static/pkg/linux.in + # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt pycurl==7.44.1 ; python_version >= "3.10" diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index f326080493b..62ce08cc6c6 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -230,7 +230,7 @@ pyasn1==0.4.8 # -r requirements/windows.txt # pyasn1-modules # rsa -pycparser==2.20 +pycparser==2.21 # via # -r requirements/windows.txt # cffi diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index 8400c9e863e..90857fea802 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -219,7 +219,7 @@ pyasn1==0.4.8 # -r requirements/windows.txt # pyasn1-modules # rsa -pycparser==2.20 +pycparser==2.21 # via # -r requirements/windows.txt # cffi diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 0f5a397c479..349db8286dc 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -681,8 +681,11 @@ pyasn1==0.4.8 # pyasn1-modules # rsa # smbprotocol -pycparser==2.19 - # via cffi +pycparser==2.21 ; python_version >= "3.9" + # via + # -r requirements/static/ci/common.in + # -r requirements/static/pkg/linux.in + # cffi pycryptodomex==3.10.1 # via -r requirements/crypto.txt pycurl==7.44.1 ; python_version <= "3.9" diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index b2592a5f724..dce8c0016d6 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.9/darwin.txt --pip-args='--constraint=requirements/static/pkg/py3.9/darwin.txt' requirements/darwin.txt requirements/pyobjc.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/darwin.in requirements/static/pkg/darwin.in +# pip-compile --output-file=requirements/static/ci/py3.9/darwin.txt --pip-args='--constraint=requirements/static/pkg/py3.9/darwin.txt' requirements/darwin.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/darwin.in requirements/static/pkg/darwin.in # adal==1.2.5 # via @@ -678,9 +678,10 @@ pyasn1==0.4.8 # -r requirements/darwin.txt # pyasn1-modules # rsa -pycparser==2.19 +pycparser==2.21 ; python_version >= "3.9" # via # -r requirements/darwin.txt + # -r requirements/static/ci/common.in # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt @@ -921,138 +922,3 @@ zipp==3.5.0 # The following packages are considered to be unsafe in a requirements file: # setuptools -# Passthrough dependencies from requirements/pyobjc.txt -pyobjc-core==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-accessibility==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-accounts==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-addressbook==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-adservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-adsupport==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-applescriptkit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-applescriptobjc==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-applicationservices==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-apptrackingtransparency==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-authenticationservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-automaticassessmentconfiguration==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-automator==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-avfoundation==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "16.0" -pyobjc-framework-avkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-businesschat==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-calendarstore==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-callkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-cfnetwork==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-classkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-cloudkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-cocoa==7.2 -pyobjc-framework-collaboration==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-colorsync==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-contacts==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-contactsui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-coreaudio==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-coreaudiokit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-corebluetooth==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-coredata==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-corehaptics==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-corelocation==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-coremedia==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-coremediaio==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-coremidi==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-coreml==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-coremotion==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-coreservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-corespotlight==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-coretext==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-corewlan==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-cryptotokenkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-devicecheck==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-dictionaryservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-discrecording==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-discrecordingui==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-diskarbitration==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-dvdplayback==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-eventkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-exceptionhandling==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-executionpolicy==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-externalaccessory==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-fileprovider==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-fileproviderui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-findersync==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-fsevents==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-gamecenter==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-gamecontroller==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-gamekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-gameplaykit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-imagecapturecore==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-imserviceplugin==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-inputmethodkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-installerplugins==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-instantmessage==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-intents==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "16.0" -pyobjc-framework-interfacebuilderkit==7.2; platform_release >= "9.0" and platform_release < "11.0" and sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-iosurface==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-ituneslibrary==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-kernelmanagement==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-latentsemanticmapping==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-launchservices==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-libdispatch==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-linkpresentation==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-localauthentication==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-mapkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-mediaaccessibility==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-medialibrary==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-mediaplayer==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "16.0" -pyobjc-framework-mediatoolbox==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-message==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release < "13.0" -pyobjc-framework-metal==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-metalkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-metalperformanceshaders==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-metalperformanceshadersgraph==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-mlcompute==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-modelio==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-multipeerconnectivity==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-naturallanguage==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-netfs==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-network==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-networkextension==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-notificationcenter==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-opendirectory==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-osakit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-oslog==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-passkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-pencilkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-photos==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-photosui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-preferencepanes==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-pubsub==7.2; platform_release >= "9.0" and platform_release < "18.0" and sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-pushkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-quartz==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-quicklookthumbnailing==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-replaykit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-safariservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-scenekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-screensaver==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-screentime==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-scriptingbridge==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-searchkit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-security==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-securityfoundation==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-securityinterface==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-servernotification==7.2; platform_release >= "10.0" and platform_release < "13.0" and sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-servicemanagement==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-social==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-soundanalysis==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-speech==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-spritekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-storekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-syncservices==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-systemconfiguration==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-systemextensions==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-uniformtypeidentifiers==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-usernotifications==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-usernotificationsui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-videosubscriberaccount==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-videotoolbox==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-virtualization==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-vision==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-webkit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc==7.2; sys_platform == "darwin" and python_version >= "3.7" diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index fc0051e503b..7a93efb1a3f 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -674,8 +674,11 @@ pyasn1==0.4.8 # via # pyasn1-modules # rsa -pycparser==2.17 - # via cffi +pycparser==2.21 ; python_version >= "3.9" + # via + # -r requirements/static/ci/common.in + # -r requirements/static/pkg/linux.in + # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt pycurl==7.44.1 ; python_version <= "3.9" diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 40cfa2b12c3..6186295e48b 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -673,8 +673,11 @@ pyasn1==0.4.8 # via # pyasn1-modules # rsa -pycparser==2.17 - # via cffi +pycparser==2.21 ; python_version >= "3.9" + # via + # -r requirements/static/ci/common.in + # -r requirements/static/pkg/freebsd.in + # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt pycurl==7.43.0.6 ; python_version <= "3.9" diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index c256df0b13d..99e3c22cf09 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -674,8 +674,11 @@ pyasn1==0.4.8 # rsa pycodestyle==2.5.0 # via saltpylint -pycparser==2.20 - # via cffi +pycparser==2.21 ; python_version >= "3.9" + # via + # -r requirements/static/ci/common.in + # -r requirements/static/pkg/linux.in + # cffi pycryptodomex==3.10.1 # via -r requirements/crypto.txt pycurl==7.44.1 ; python_version <= "3.9" diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 7535a20b8c7..19ff166ef9f 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -689,8 +689,11 @@ pyasn1==0.4.8 # via # pyasn1-modules # rsa -pycparser==2.17 - # via cffi +pycparser==2.21 ; python_version >= "3.9" + # via + # -r requirements/static/ci/common.in + # -r requirements/static/pkg/linux.in + # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt pycurl==7.43.0.6 ; python_version <= "3.9" diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 7e1a708b1d2..bda0ad6461b 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -219,8 +219,9 @@ pyasn1==0.4.8 # -r requirements/windows.txt # pyasn1-modules # rsa -pycparser==2.20 +pycparser==2.21 ; python_version >= "3.9" # via + # -r requirements/static/ci/common.in # -r requirements/windows.txt # cffi # pythonnet diff --git a/requirements/static/pkg/freebsd.in b/requirements/static/pkg/freebsd.in index 0037a1d1504..ef495e26b05 100644 --- a/requirements/static/pkg/freebsd.in +++ b/requirements/static/pkg/freebsd.in @@ -2,6 +2,7 @@ # Any non hard dependencies of Salt for FreeBSD can go here cherrypy backports.ssl_match_hostname>=3.7.0.1; python_version < '3.7' +pycparser>=2.21; python_version >= '3.9' pyopenssl>=19.0.0 python-dateutil>=2.8.0 python-gnupg>=0.4.4 diff --git a/requirements/static/pkg/linux.in b/requirements/static/pkg/linux.in index cf03e8dfa94..e9681cde837 100644 --- a/requirements/static/pkg/linux.in +++ b/requirements/static/pkg/linux.in @@ -2,6 +2,7 @@ # Any non hard dependencies of Salt for linux can go here cherrypy backports.ssl_match_hostname>=3.7.0.1; python_version < '3.7' +pycparser>=2.21; python_version >= '3.9' pyopenssl>=19.0.0 python-dateutil>=2.8.0 python-gnupg>=0.4.4 diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 84b37b1b1b8..620bae7aaf5 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.10/darwin.txt requirements/darwin.txt requirements/pyobjc.txt requirements/static/pkg/darwin.in +# pip-compile --output-file=requirements/static/pkg/py3.10/darwin.txt requirements/darwin.txt requirements/static/pkg/darwin.in # apache-libcloud==2.5.0 # via -r requirements/darwin.txt @@ -70,7 +70,7 @@ psutil==5.8.0 # via -r requirements/base.txt pyasn1==0.4.8 # via -r requirements/darwin.txt -pycparser==2.19 +pycparser==2.21 # via # -r requirements/darwin.txt # cffi @@ -116,138 +116,3 @@ zc.lockfile==2.0 # The following packages are considered to be unsafe in a requirements file: # setuptools -# Passthrough dependencies from requirements/pyobjc.txt -pyobjc-core==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-accessibility==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-accounts==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-addressbook==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-adservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-adsupport==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-applescriptkit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-applescriptobjc==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-applicationservices==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-apptrackingtransparency==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-authenticationservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-automaticassessmentconfiguration==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-automator==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-avfoundation==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "16.0" -pyobjc-framework-avkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-businesschat==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-calendarstore==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-callkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-cfnetwork==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-classkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-cloudkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-cocoa==7.2 -pyobjc-framework-collaboration==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-colorsync==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-contacts==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-contactsui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-coreaudio==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-coreaudiokit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-corebluetooth==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-coredata==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-corehaptics==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-corelocation==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-coremedia==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-coremediaio==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-coremidi==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-coreml==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-coremotion==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-coreservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-corespotlight==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-coretext==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-corewlan==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-cryptotokenkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-devicecheck==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-dictionaryservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-discrecording==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-discrecordingui==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-diskarbitration==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-dvdplayback==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-eventkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-exceptionhandling==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-executionpolicy==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-externalaccessory==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-fileprovider==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-fileproviderui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-findersync==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-fsevents==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-gamecenter==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-gamecontroller==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-gamekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-gameplaykit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-imagecapturecore==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-imserviceplugin==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-inputmethodkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-installerplugins==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-instantmessage==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-intents==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "16.0" -pyobjc-framework-interfacebuilderkit==7.2; platform_release >= "9.0" and platform_release < "11.0" and sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-iosurface==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-ituneslibrary==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-kernelmanagement==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-latentsemanticmapping==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-launchservices==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-libdispatch==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-linkpresentation==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-localauthentication==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-mapkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-mediaaccessibility==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-medialibrary==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-mediaplayer==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "16.0" -pyobjc-framework-mediatoolbox==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-message==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release < "13.0" -pyobjc-framework-metal==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-metalkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-metalperformanceshaders==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-metalperformanceshadersgraph==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-mlcompute==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-modelio==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-multipeerconnectivity==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-naturallanguage==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-netfs==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-network==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-networkextension==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-notificationcenter==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-opendirectory==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-osakit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-oslog==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-passkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-pencilkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-photos==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-photosui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-preferencepanes==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-pubsub==7.2; platform_release >= "9.0" and platform_release < "18.0" and sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-pushkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-quartz==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-quicklookthumbnailing==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-replaykit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-safariservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-scenekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-screensaver==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-screentime==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-scriptingbridge==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-searchkit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-security==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-securityfoundation==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-securityinterface==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-servernotification==7.2; platform_release >= "10.0" and platform_release < "13.0" and sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-servicemanagement==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-social==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-soundanalysis==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-speech==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-spritekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-storekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-syncservices==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-systemconfiguration==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-systemextensions==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-uniformtypeidentifiers==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-usernotifications==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-usernotificationsui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-videosubscriberaccount==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-videotoolbox==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-virtualization==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-vision==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-webkit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc==7.2; sys_platform == "darwin" and python_version >= "3.7" diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index 654182fa9f0..8ecfb0bc239 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -55,8 +55,10 @@ portend==2.4 # via cherrypy psutil==5.8.0 # via -r requirements/base.txt -pycparser==2.17 - # via cffi +pycparser==2.21 ; python_version >= "3.9" + # via + # -r requirements/static/pkg/freebsd.in + # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt pyopenssl==19.1.0 diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index 75d6cc95a31..e3a9db82b2f 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -55,8 +55,10 @@ portend==2.4 # via cherrypy psutil==5.8.0 # via -r requirements/base.txt -pycparser==2.17 - # via cffi +pycparser==2.21 ; python_version >= "3.9" + # via + # -r requirements/static/pkg/linux.in + # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt pyopenssl==19.1.0 diff --git a/requirements/static/pkg/py3.7/windows.txt b/requirements/static/pkg/py3.7/windows.txt index 0c064e12c0d..fa22a7a3e3d 100644 --- a/requirements/static/pkg/py3.7/windows.txt +++ b/requirements/static/pkg/py3.7/windows.txt @@ -76,7 +76,7 @@ psutil==5.8.0 # via -r requirements/base.txt pyasn1==0.4.8 # via -r requirements/windows.txt -pycparser==2.20 +pycparser==2.21 # via # -r requirements/windows.txt # cffi diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt index c9ae82289f6..1f4cbd06b37 100644 --- a/requirements/static/pkg/py3.8/windows.txt +++ b/requirements/static/pkg/py3.8/windows.txt @@ -76,7 +76,7 @@ psutil==5.8.0 # via -r requirements/base.txt pyasn1==0.4.8 # via -r requirements/windows.txt -pycparser==2.20 +pycparser==2.21 # via # -r requirements/windows.txt # cffi diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index 49f80136fc0..4842e291828 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.9/darwin.txt requirements/darwin.txt requirements/pyobjc.txt requirements/static/pkg/darwin.in +# pip-compile --output-file=requirements/static/pkg/py3.9/darwin.txt requirements/darwin.txt requirements/static/pkg/darwin.in # apache-libcloud==2.5.0 # via -r requirements/darwin.txt @@ -72,7 +72,7 @@ psutil==5.8.0 # via -r requirements/base.txt pyasn1==0.4.8 # via -r requirements/darwin.txt -pycparser==2.19 +pycparser==2.21 # via # -r requirements/darwin.txt # cffi @@ -120,138 +120,3 @@ zipp==3.5.0 # The following packages are considered to be unsafe in a requirements file: # setuptools -# Passthrough dependencies from requirements/pyobjc.txt -pyobjc-core==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-accessibility==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-accounts==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-addressbook==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-adservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-adsupport==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-applescriptkit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-applescriptobjc==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-applicationservices==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-apptrackingtransparency==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-authenticationservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-automaticassessmentconfiguration==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-automator==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-avfoundation==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "16.0" -pyobjc-framework-avkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-businesschat==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-calendarstore==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-callkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-cfnetwork==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-classkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-cloudkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-cocoa==7.2 -pyobjc-framework-collaboration==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-colorsync==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-contacts==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-contactsui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-coreaudio==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-coreaudiokit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-corebluetooth==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-coredata==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-corehaptics==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-corelocation==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-coremedia==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-coremediaio==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-coremidi==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-coreml==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-coremotion==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-coreservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-corespotlight==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-coretext==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-corewlan==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-cryptotokenkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-devicecheck==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-dictionaryservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-discrecording==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-discrecordingui==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-diskarbitration==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-dvdplayback==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-eventkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-exceptionhandling==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-executionpolicy==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-externalaccessory==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-fileprovider==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-fileproviderui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-findersync==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-fsevents==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-gamecenter==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-gamecontroller==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-gamekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-gameplaykit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-imagecapturecore==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-imserviceplugin==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-inputmethodkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-installerplugins==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-instantmessage==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-intents==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "16.0" -pyobjc-framework-interfacebuilderkit==7.2; platform_release >= "9.0" and platform_release < "11.0" and sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-iosurface==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-ituneslibrary==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-kernelmanagement==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-latentsemanticmapping==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-launchservices==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-libdispatch==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-linkpresentation==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-localauthentication==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-mapkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-mediaaccessibility==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-medialibrary==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-mediaplayer==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "16.0" -pyobjc-framework-mediatoolbox==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "13.0" -pyobjc-framework-message==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release < "13.0" -pyobjc-framework-metal==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-metalkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-metalperformanceshaders==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-metalperformanceshadersgraph==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-mlcompute==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-modelio==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-multipeerconnectivity==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-naturallanguage==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-netfs==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-network==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-networkextension==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-notificationcenter==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "14.0" -pyobjc-framework-opendirectory==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-osakit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-oslog==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-passkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-pencilkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-photos==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-photosui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-preferencepanes==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-pubsub==7.2; platform_release >= "9.0" and platform_release < "18.0" and sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-pushkit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-quartz==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-quicklookthumbnailing==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-replaykit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-safariservices==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-scenekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-screensaver==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-screentime==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-scriptingbridge==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "9.0" -pyobjc-framework-searchkit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-security==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-securityfoundation==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-securityinterface==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-servernotification==7.2; platform_release >= "10.0" and platform_release < "13.0" and sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-servicemanagement==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "10.0" -pyobjc-framework-social==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-soundanalysis==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-speech==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-spritekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "15.0" -pyobjc-framework-storekit==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "11.0" -pyobjc-framework-syncservices==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-systemconfiguration==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc-framework-systemextensions==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "19.0" -pyobjc-framework-uniformtypeidentifiers==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-usernotifications==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-usernotificationsui==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-videosubscriberaccount==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "18.0" -pyobjc-framework-videotoolbox==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "12.0" -pyobjc-framework-virtualization==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "20.0" -pyobjc-framework-vision==7.2; sys_platform == "darwin" and python_version >= "3.7" and platform_release >= "17.0" -pyobjc-framework-webkit==7.2; sys_platform == "darwin" and python_version >= "3.7" -pyobjc==7.2; sys_platform == "darwin" and python_version >= "3.7" diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index 8e779ce3143..8cadd7ebed6 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -57,8 +57,10 @@ portend==2.4 # via cherrypy psutil==5.8.0 # via -r requirements/base.txt -pycparser==2.17 - # via cffi +pycparser==2.21 ; python_version >= "3.9" + # via + # -r requirements/static/pkg/freebsd.in + # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt pyopenssl==19.1.0 diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index 649ed98a6b2..e134923a4d4 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -55,8 +55,10 @@ portend==2.4 # via cherrypy psutil==5.8.0 # via -r requirements/base.txt -pycparser==2.17 - # via cffi +pycparser==2.21 ; python_version >= "3.9" + # via + # -r requirements/static/pkg/linux.in + # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt pyopenssl==19.1.0 diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index 44e9a551b24..27502b303ae 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -76,7 +76,7 @@ psutil==5.8.0 # via -r requirements/base.txt pyasn1==0.4.8 # via -r requirements/windows.txt -pycparser==2.20 +pycparser==2.21 # via # -r requirements/windows.txt # cffi diff --git a/requirements/windows.txt b/requirements/windows.txt index bc364d83c64..a13b4d83bc7 100644 --- a/requirements/windows.txt +++ b/requirements/windows.txt @@ -17,7 +17,7 @@ libnacl>=1.8.0 lxml>=4.6.3 mako>=1.1.4 pyasn1>=0.4.8 -pycparser>=2.20 +pycparser>=2.21 pycurl>=7.43.0.5 # PyCurl does not provide a whl file for newer versions pymssql>=2.2.1 pymysql>=1.0.2 diff --git a/run.py b/run.py index 99e66d70ee9..ec84b096208 100755 --- a/run.py +++ b/run.py @@ -31,6 +31,7 @@ AVAIL = ( "ssh", "support", "syndic", + "python", ) @@ -57,6 +58,22 @@ def py_shell(): shell.interact() +def python_runtime(): + # extract the absolute script path to alter sys.path and specific dunder variables + script = pathlib.Path(sys.argv[2]).expanduser().resolve() + sys.path.insert(0, str(script.parent)) + + # update passed args so they don't start with " python" + sys.argv[:] = sys.argv[2:] + exec_locals = {"__name__": "__main__", "__file__": str(script), "__doc__": None} + with open(script, encoding="utf-8") as rfh: + try: + exec(rfh.read(), exec_locals) + except Exception: + traceback.print_exc() + sys.exit(1) + + def redirect(argv): """ Change the args and redirect to another salt script @@ -71,6 +88,14 @@ def redirect(argv): if cmd == "shell": py_shell() return + if cmd == "python": + if len(argv) < 3: + msg = "Must pass script location to this command" + print(msg, file=sys.stderr, flush=True) + sys.exit(1) + + python_runtime() + return if tiamatpip.cli.should_redirect_argv(argv): tiamatpip.cli.process_pip_argv(argv) return diff --git a/salt/modules/mod_random.py b/salt/modules/mod_random.py index 7ffa1371589..247056a63d0 100644 --- a/salt/modules/mod_random.py +++ b/salt/modules/mod_random.py @@ -7,14 +7,11 @@ Provides access to randomness generators. """ import base64 -import hashlib import random +import salt.utils.data import salt.utils.pycrypto from salt.exceptions import SaltInvocationError -from salt.utils.decorators.jinja import jinja_filter - -ALGORITHMS_ATTR_NAME = "algorithms_guaranteed" # Define the module's virtual name __virtualname__ = "random" @@ -43,24 +40,7 @@ def hash(value, algorithm="sha512"): salt '*' random.hash 'I am a string' md5 """ - if isinstance(value, str): - # Under Python 3 we must work with bytes - value = value.encode(__salt_system_encoding__) - - if hasattr(hashlib, ALGORITHMS_ATTR_NAME) and algorithm in getattr( - hashlib, ALGORITHMS_ATTR_NAME - ): - hasher = hashlib.new(algorithm) - hasher.update(value) - out = hasher.hexdigest() - elif hasattr(hashlib, algorithm): - hasher = hashlib.new(algorithm) - hasher.update(value) - out = hasher.hexdigest() - else: - raise SaltInvocationError("You must specify a valid algorithm.") - - return out + return salt.utils.data.hash(value, algorithm=algorithm) def str_encode(value, encoder="base64"): @@ -280,7 +260,6 @@ def seed(range=10, hash=None): return random.randrange(range) -@jinja_filter("random_sample") def sample(value, size, seed=None): """ Return a given sample size from a list. By default, the random number @@ -303,14 +282,9 @@ def sample(value, size, seed=None): salt '*' random.sample '["one", "two"]' 1 seed="something" """ - if seed is None: - ret = random.sample(value, size) - else: - ret = random.Random(hash(seed)).sample(value, size) - return ret + return salt.utils.data.sample(value, size, seed=seed) -@jinja_filter("random_shuffle") def shuffle(value, seed=None): """ Return a shuffled copy of an input list. By default, the random number @@ -330,4 +304,4 @@ def shuffle(value, seed=None): salt '*' random.shuffle '["one", "two"]' seed="something" """ - return sample(value, len(value), seed=seed) + return salt.utils.data.shuffle(value, seed=seed) diff --git a/salt/utils/data.py b/salt/utils/data.py index 0b3634d8424..f50ebbab789 100644 --- a/salt/utils/data.py +++ b/salt/utils/data.py @@ -8,7 +8,9 @@ import copy import datetime import fnmatch import functools +import hashlib import logging +import random import re from collections.abc import Mapping, MutableMapping, Sequence @@ -25,6 +27,8 @@ try: except ImportError: jmespath = None +ALGORITHMS_ATTR_NAME = "algorithms_guaranteed" + log = logging.getLogger(__name__) @@ -1612,3 +1616,77 @@ def flatten(data, levels=None, preserve_nulls=False, _ids=None): ret.append(element) return ret + + +def hash(value, algorithm="sha512"): + """ + .. versionadded:: 2014.7.0 + + Encodes a value with the specified encoder. + + value + The value to be hashed. + + algorithm : sha512 + The algorithm to use. May be any valid algorithm supported by + hashlib. + """ + if isinstance(value, str): + # Under Python 3 we must work with bytes + value = value.encode(__salt_system_encoding__) + + if hasattr(hashlib, ALGORITHMS_ATTR_NAME) and algorithm in getattr( + hashlib, ALGORITHMS_ATTR_NAME + ): + hasher = hashlib.new(algorithm) + hasher.update(value) + out = hasher.hexdigest() + elif hasattr(hashlib, algorithm): + hasher = hashlib.new(algorithm) + hasher.update(value) + out = hasher.hexdigest() + else: + raise SaltException("You must specify a valid algorithm.") + + return out + + +@jinja_filter("random_sample") +def sample(value, size, seed=None): + """ + Return a given sample size from a list. By default, the random number + generator uses the current system time unless given a seed value. + + .. versionadded:: 3005 + + value + A list to e used as input. + + size + The sample size to return. + + seed + Any value which will be hashed as a seed for random. + """ + if seed is None: + ret = random.sample(value, size) + else: + ret = random.Random(hash(seed)).sample(value, size) + return ret + + +@jinja_filter("random_shuffle") +def shuffle(value, seed=None): + """ + Return a shuffled copy of an input list. By default, the random number + generator uses the current system time unless given a seed value. + + .. versionadded:: 3005 + + value + A list to be used as input. + + seed + Any value which will be hashed as a seed for random. + """ + return sample(value, len(value), seed=seed) diff --git a/tests/pytests/integration/utils/test_templates.py b/tests/pytests/integration/utils/test_templates.py index 3a19450c13d..241bd8f58d8 100644 --- a/tests/pytests/integration/utils/test_templates.py +++ b/tests/pytests/integration/utils/test_templates.py @@ -37,3 +37,38 @@ def test_issue_60083( assert len(keys) == 1 key = keys[0] assert ret.data[key]["changes"]["diff"] == "New file" + + +def test_issue_62372( + salt_call_cli, + tmp_path, + base_env_state_tree_root_dir, +): + """ + Validate that we can use the random_* filters + Issue #62372 + """ + target_path = tmp_path / "issue-62372-target.txt" + assert not os.path.exists(str(target_path)) + sls_name = "issue-62372" + sls_contents = """ + {% set my_list = ["one", "two", "three", "four"] -%} + {{ pillar["target-path"] }}: + file.managed: + - contents: | + {{ my_list | random_sample(2, seed="static") }} + {{ my_list | random_shuffle(seed="static") }} + """ + sls_tempfile = pytest.helpers.temp_file( + "{}.sls".format(sls_name), sls_contents, base_env_state_tree_root_dir + ) + with sls_tempfile: + ret = salt_call_cli.run( + "state.apply", sls_name, pillar={"target-path": str(target_path)} + ) + assert ret.stdout.find("Jinja error") == -1 + assert ret.data + keys = list(ret.data.keys()) + assert len(keys) == 1 + key = keys[0] + assert ret.data[key]["changes"]["diff"] == "New file" diff --git a/tests/pytests/unit/modules/test_mod_random.py b/tests/pytests/unit/modules/test_mod_random.py index a92c1a4c420..40b1e435a88 100644 --- a/tests/pytests/unit/modules/test_mod_random.py +++ b/tests/pytests/unit/modules/test_mod_random.py @@ -8,7 +8,7 @@ import pytest import salt.modules.mod_random as mod_random import salt.utils.pycrypto -from salt.exceptions import SaltInvocationError +from salt.exceptions import SaltException, SaltInvocationError from tests.support.mock import patch @@ -44,7 +44,7 @@ def test_hash(): Test for Encodes a value with the specified encoder. """ assert mod_random.hash("value")[0:4] == "ec2c" - pytest.raises(SaltInvocationError, mod_random.hash, "value", "algorithm") + pytest.raises(SaltException, mod_random.hash, "value", "algorithm") def test_str_encode(): @@ -80,17 +80,3 @@ def test_shadow_hash(): """ with patch.object(salt.utils.pycrypto, "gen_hash", return_value="A"): assert mod_random.shadow_hash() == "A" - - -def test_sample(): - lst = ["one", "two", "three", "four"] - assert len(mod_random.sample(lst, 0)) == 0 - assert len(mod_random.sample(lst, 2)) == 2 - pytest.raises(ValueError, mod_random.sample, lst, 5) - assert mod_random.sample(lst, 2, seed="static") == ["four", "two"] - - -def test_shuffle(): - lst = ["one", "two", "three", "four"] - assert len(mod_random.shuffle(lst)) == 4 - assert mod_random.shuffle(lst, seed="static") == ["four", "two", "three", "one"] diff --git a/tests/pytests/unit/utils/test_data.py b/tests/pytests/unit/utils/test_data.py index 877bb5a7785..c5a112465b8 100644 --- a/tests/pytests/unit/utils/test_data.py +++ b/tests/pytests/unit/utils/test_data.py @@ -82,3 +82,22 @@ def test_flatten_recursion_error(): with pytest.raises(RecursionError) as err: salt.utils.data.flatten(data) assert str(err.value) == "Reference cycle detected. Check input list." + + +def test_sample(): + lst = ["one", "two", "three", "four"] + assert len(salt.utils.data.sample(lst, 0)) == 0 + assert len(salt.utils.data.sample(lst, 2)) == 2 + pytest.raises(ValueError, salt.utils.data.sample, lst, 5) + assert salt.utils.data.sample(lst, 2, seed="static") == ["four", "two"] + + +def test_shuffle(): + lst = ["one", "two", "three", "four"] + assert len(salt.utils.data.shuffle(lst)) == 4 + assert salt.utils.data.shuffle(lst, seed="static") == [ + "four", + "two", + "three", + "one", + ]