From 1e145044ae78506614f6ef388468daefb4f9bdd9 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Mon, 12 Sep 2022 14:49:01 -0700 Subject: [PATCH 1/4] salt-ssh==3004.2 lol --- packages.ini | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/packages.ini b/packages.ini index 5de60780..d43f2fe7 100644 --- a/packages.ini +++ b/packages.ini @@ -7,6 +7,8 @@ [amqp==2.6.1] [amqp==5.1.1] +[apache-libcloud==2.5.0] + [asgiref==3.5.2] [async-generator==1.10] @@ -58,15 +60,20 @@ validate_extras = d [celery==4.4.7] [celery==5.2.7] +[certifi==2021.5.30] [certifi==2022.5.18.1] [certifi==2022.6.15] +[cffi==1.14.6] +apt_requires = libffi-dev +brew_requires = libffi [cffi==1.15.1] apt_requires = libffi-dev brew_requires = libffi [cfgv==3.3.1] +[chardet==3.0.4] [chardet==4.0.0] [chardet==5.0.0] @@ -74,6 +81,10 @@ brew_requires = libffi [charset-normalizer==2.1.0] [charset-normalizer==2.1.1] +[cheroot==8.5.2] + +[cherrypy==18.6.1] + [click==8.0.4] [click==8.1.3] @@ -94,6 +105,8 @@ apt_requires = brew_requires = wget custom_prebuild = prebuild/librdkafka v1.9.2 +[contextvars==2.4] + [coverage==6.3.3] [coverage==6.4.1] [coverage==6.4.3] @@ -102,6 +115,7 @@ custom_prebuild = prebuild/librdkafka v1.9.2 [croniter==0.3.37] [croniter==1.3.5] +[cryptography==3.3.2] [cryptography==37.0.2] [cryptography==37.0.4] @@ -130,6 +144,8 @@ validate_incorrect_missing_deps = six [distlib==0.3.5] [distlib==0.3.6] +[distro==1.5.0] + [django==2.2.28] [django==4.1] @@ -187,6 +203,10 @@ validate_incorrect_missing_deps = six [frozenlist==1.3.1] +[gitdb==4.0.5] + +[gitpython==3.1.12] + [google-api-core==1.32.0] [google-api-core==2.8.2] @@ -241,12 +261,16 @@ custom_prebuild = prebuild/crc32c 1.1.2 [identify==2.5.1] [identify==2.5.3] +[idna==2.8] [idna==2.10] [idna==3.3] [imagesize==1.4.1] +[immutables==0.15] + [importlib-metadata==3.10.1] +[importlib-metadata==4.6.4] [importlib-metadata==4.12.0] [importlib-resources==5.8.0] @@ -262,6 +286,15 @@ custom_prebuild = prebuild/crc32c 1.1.2 [itsdangerous==2.1.2] +[jaraco-classes==3.2.1] + +[jaraco-collections==3.4.0] + +[jaraco-functools==2.0] + +[jaraco-text==3.5.1] + +[jinja2==2.11.3] [jinja2==3.1.2] [jmespath==0.10.0] @@ -281,6 +314,8 @@ custom_prebuild = prebuild/crc32c 1.1.2 [libcst==0.4.3] [libcst==0.4.7] +[linode-python==1.1.1] + [lxml==4.6.5] apt_requires = libxml2-dev @@ -296,9 +331,12 @@ brew_requires = libxml2 libxslt +[mako==1.1.4] + [markdown==3.3.7] [markdown==3.4.1] +[markupsafe==1.1.1] [markupsafe==2.1.1] [maxminddb==2.0.3] @@ -319,9 +357,11 @@ brew_requires = libmaxminddb [mock==4.0.3] +[more-itertools==8.2.0] [more-itertools==8.13.0] [more-itertools==8.14.0] +[msgpack==1.0.2] [msgpack==1.0.4] [msgpack-types==0.2.0] @@ -392,6 +432,8 @@ brew_requires = libmaxminddb [pluggy==0.13.1] [pluggy==1.0.0] +[portend==2.6] + [pre-commit==2.18.1] [pre-commit==2.20.0] @@ -406,6 +448,8 @@ brew_requires = libmaxminddb [protobuf==3.19.0] [protobuf==4.21.5] +[psutil==5.8.0] + [psycopg2-binary==2.8.6] apt_requires = libpq-dev brew_requires = @@ -432,8 +476,11 @@ brew_requires = [pycountry==17.5.14] [pycountry==22.3.5] +[pycparser==2.19] [pycparser==2.21] +[pycryptodomex==3.9.8] + [pyelftools==0.28] [pyelftools==0.29] @@ -444,6 +491,13 @@ brew_requires = [pyjwt==2.4.0] +[pyobjc-core==8.5] + +[pyobjc-framework-cocoa==7.2] + +[pyobjc-framework-servernotification==7.2] + +[pyopenssl==19.0.0] [pyopenssl==22.0.0] [pyparsing==3.0.9] @@ -472,9 +526,12 @@ brew_requires = [pytest-xdist==2.4.0] [pytest-xdist==2.5.0] +[python-dateutil==2.8.0] [python-dateutil==2.8.1] [python-dateutil==2.8.2] +[python-gnupg==0.4.4] + [python-memcached==1.59] [python-rapidjson==1.4] @@ -488,6 +545,7 @@ brew_requires = [python3-saml==1.14.0] [pytz==2018.9] +[pytz==2021.1] [pytz==2022.1] [pytz==2022.2] [pytz==2022.2.1] @@ -511,6 +569,8 @@ brew_requires = libyaml apt_requires = libyaml-dev brew_requires = libyaml +[pyzmq==21.0.2] + [rb==1.9.0] [redis==3.4.1] @@ -546,6 +606,8 @@ brew_requires = libyaml [s3transfer==0.5.2] [s3transfer==0.6.0] +[salt-ssh==3004.2] + [selenium==4.3.0] [selenium==4.4.3] @@ -562,6 +624,8 @@ brew_requires = libyaml [sentry-sdk==1.9.5] [sentry-sdk==1.9.8] +[setproctitle==1.1.10] + [setuptools==56.0.0] [setuptools==62.3.2] [setuptools==63.1.0] @@ -577,6 +641,8 @@ brew_requires = libyaml [six==1.16.0] +[smmap==3.0.2] + [sniffio==1.2.0] [snowballstemmer==2.2.0] @@ -617,6 +683,10 @@ validate_incorrect_missing_deps = beautifulsoup4 [symbolic==8.7.1] [symbolic==9.1.1] +[tempora==4.1.1] + +[timelib==0.2.5] + [tokenize-rt==4.2.1] [toml==0.10.2] @@ -676,6 +746,7 @@ validate_incorrect_missing_deps = beautifulsoup4 [uritemplate==4.1.1] +[urllib3==1.26.6] [urllib3==1.26.9] [urllib3==1.26.10] [urllib3==1.26.11] @@ -688,6 +759,8 @@ validate_incorrect_missing_deps = beautifulsoup4 [virtualenv==20.15.1] [virtualenv==20.16.3] +[vultr==1.0.1] + [watchdog==2.1.9] [wcwidth==0.2.5] @@ -724,6 +797,9 @@ brew_requires = [yarl==1.8.1] +[zc-lockfile==2.0] + +[zipp==3.5.0] [zipp==3.8.1] [zstandard==0.18.0] From 042227c491740d2448b1ec1c8ead4b619735ebf7 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Mon, 12 Sep 2022 14:50:31 -0700 Subject: [PATCH 2/4] salt==3004 --- packages.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages.ini b/packages.ini index d43f2fe7..8bf8faa3 100644 --- a/packages.ini +++ b/packages.ini @@ -606,6 +606,8 @@ brew_requires = libyaml [s3transfer==0.5.2] [s3transfer==0.6.0] +[salt==3004] + [salt-ssh==3004.2] [selenium==4.3.0] From c21833c6980be99c6013ee0795350932a15462ca Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Tue, 13 Sep 2022 12:00:12 -0700 Subject: [PATCH 3/4] fix xtheirs merge --- packages.ini | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/packages.ini b/packages.ini index 978a4274..20d9905e 100644 --- a/packages.ini +++ b/packages.ini @@ -296,6 +296,15 @@ custom_prebuild = prebuild/crc32c 1.1.2 [itsdangerous==2.1.2] +[jaraco-classes==3.2.1] + +[jaraco-collections==3.4.0] + +[jaraco-functools==2.0] + +[jaraco-text==3.5.1] + +[jinja2==2.11.3] [jinja2==3.0.3] [jinja2==3.1.2] @@ -457,6 +466,7 @@ brew_requires = libmaxminddb [protobuf==3.19.0] [protobuf==4.21.5] +[psutil==5.8.0] [psutil==5.9.2] [psycopg2-binary==2.8.6] @@ -502,6 +512,13 @@ brew_requires = [pynacl==1.5.0] +[pyobjc-core==8.5] + +[pyobjc-framework-cocoa==7.2] + +[pyobjc-framework-servernotification==7.2] + +[pyopenssl==19.0.0] [pyopenssl==22.0.0] [pyparsing==3.0.9] @@ -534,6 +551,8 @@ brew_requires = [python-dateutil==2.8.1] [python-dateutil==2.8.2] +[python-gnupg==0.4.4] + [python-hcl2==2.0.3] [python-memcached==1.59] @@ -696,6 +715,10 @@ validate_incorrect_missing_deps = beautifulsoup4 [tabulate==0.8.9] +[tempora==4.1.1] + +[timelib==0.2.5] + [tokenize-rt==4.2.1] [toml==0.10.2] From cbf6a0fb959bb746a74cdf0f9d70f19bf1af05c9 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Tue, 13 Sep 2022 12:00:21 -0700 Subject: [PATCH 4/4] pycparser sdist has examples/c_files/*.c --- build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.py b/build.py index cce575ba..426b21c1 100644 --- a/build.py +++ b/build.py @@ -522,7 +522,7 @@ def _likely_binary(sdist: str) -> str | None: ret = set() for name in names: - if "/test/" in name or "/tests/" in name: + if "/test/" in name or "/tests/" in name or "/examples/" in name: continue _, ext = os.path.splitext(name)