Consolidate requirements into requirements/base.txt

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

requirements/base.txt

@@ -3,12 +3,41 @@ jmespath
 msgpack>=1.0.0
 PyYAML
 MarkupSafe
-requests>=1.0.0
+requests>=2.25.1
 distro>=1.0.1
 psutil>=5.0.0
 packaging>=21.3
 looseversion
 tornado>=6.3.3
 
-# We need contextvars for salt-ssh
+# We need contextvars for salt-ssh.
+# Even on python versions which ships with contextvars in the standard library!
 contextvars
+
+setproctitle>=1.2.3
+timelib>=0.2.5
+pyopenssl>=20.0.1
+python-dateutil>=2.8.1
+python-gnupg>=0.4.7
+cherrypy>=18.6.1
+importlib-metadata>=3.3.0
+cryptography>=41.0.3
+
+# From old requirements/static/pkg/linux.in
+rpm-vercmp; sys_platform == 'linux'
+
+# From old windows.txt requirements file
+pywin32>=305; sys_platform == 'win32'
+wmi>=1.5.1; sys_platform == 'win32'
+pythonnet>=3.0.1; sys_platform == 'win32'
+pymssql>=2.2.1; sys_platform == 'win32'
+pymysql>=1.0.2; sys_platform == 'win32'
+lxml>=4.6.3; sys_platform == 'win32'
+
+# From old darwin.txt requirements file
+apache-libcloud>=2.4.0; sys_platform == 'darwin'
+linode-python>=1.1.1; sys_platform == 'darwin'
+vultr>=1.0.1; sys_platform == 'darwin'
+
+# From old windows.txt and darwin.txt requirements file
+gitpython>=3.1.35; sys_platform == 'win32' or sys_platform == 'darwin'

requirements/crypto.txt

@@ -1,2 +1 @@
 pycryptodomex>=3.9.8
-cryptography>=40.0.3

requirements/darwin.txt

@@ -1,18 +1,5 @@
 # Darwin source distribution requirements
+# Don't add any requirements here, add them in requirements/base.txt
+# If they are macOS specific, place "; sys_platform == 'darwin'" in front of the requirement.
 
 -r zeromq.txt
-
-apache-libcloud>=2.4.0
-cherrypy>=17.4.1
-gitpython>=3.1.35
-cryptography>=41.0.3
-gitpython>=3.1.37
-idna>=2.8
-linode-python>=1.1.1
-pyasn1>=0.4.8
-pyopenssl>=23.2.0
-python-dateutil>=2.8.0
-python-gnupg>=0.4.4
-setproctitle>=1.2.3
-timelib>=0.2.5
-vultr>=1.0.1

requirements/static/ci/py3.10/darwin.txt

@@ -8,10 +8,10 @@ aiohttp==3.8.5
     # via etcd3-py
 aiosignal==1.3.1
     # via aiohttp
-apache-libcloud==3.7.0 ; sys_platform != "win32"
+apache-libcloud==3.7.0 ; sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
 asn1crypto==1.5.1
     # via
@@ -81,7 +81,7 @@ cheroot==10.0.0
 cherrypy==18.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
 click==8.1.3
     # via geomet
@@ -91,13 +91,12 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
     #   -r requirements/base.txt
-croniter==0.3.29 ; sys_platform != "win32"
+croniter==1.3.15 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/darwin.txt
     #   etcd3-py
     #   moto
     #   paramiko
@@ -140,10 +139,10 @@ gitdb==4.0.10
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
     #   gitpython
-gitpython==3.1.40
+gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
 google-auth==2.19.1
     # via kubernetes
@@ -152,7 +151,6 @@ hglib==2.6.2
 idna==3.4
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
-    #   -r requirements/darwin.txt
     #   etcd3-py
     #   requests
     #   yarl
@@ -160,6 +158,10 @@ immutables==0.15
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
     #   contextvars
+importlib-metadata==6.6.0
+    # via
+    #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
+    #   -r requirements/base.txt
 inflect==6.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
@@ -214,10 +216,10 @@ keyring==5.7.1
     # via -r requirements/static/ci/common.in
 kubernetes==3.0.0
     # via -r requirements/static/ci/common.in
-linode-python==1.1.1
+linode-python==1.1.1 ; sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
 looseversion==1.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
@@ -296,8 +298,6 @@ passlib==1.7.4
     # via -r requirements/static/ci/common.in
 pathspec==0.11.1
     # via yamllint
-pathtools==0.1.2
-    # via watchdog
 platformdirs==3.5.3
     # via virtualenv
 pluggy==1.0.0
@@ -317,8 +317,6 @@ pyasn1-modules==0.3.0
     # via google-auth
 pyasn1==0.4.8
     # via
-    #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
-    #   -r requirements/darwin.txt
     #   pyasn1-modules
     #   rsa
 pycparser==2.21
@@ -344,7 +342,7 @@ pynacl==1.5.0
 pyopenssl==23.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
     #   etcd3-py
 pyparsing==3.0.9
     # via junos-eznc
@@ -392,7 +390,7 @@ pytest==7.3.2
 python-dateutil==2.8.2
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
     #   botocore
     #   croniter
     #   kubernetes
@@ -403,7 +401,7 @@ python-etcd==0.4.5
 python-gnupg==0.5.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
 pytz==2023.3
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
@@ -460,7 +458,7 @@ semantic-version==2.10.0
 setproctitle==1.3.2
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
 six==1.16.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
@@ -500,7 +498,7 @@ textfsm==1.1.3
 timelib==0.3.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
@@ -542,11 +540,11 @@ virtualenv==20.23.0
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-vultr==1.0.1
+vultr==1.0.1 ; sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
-watchdog==0.10.3
+watchdog==3.0.0
     # via -r requirements/static/ci/common.in
 websocket-client==0.40.0
     # via
@@ -572,6 +570,10 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
     #   cherrypy
+zipp==3.16.2
+    # via
+    #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
+    #   importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements/static/ci/py3.10/freebsd.txt

@@ -77,8 +77,8 @@ cheroot==10.0.0
 cherrypy==18.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/static/pkg/freebsd.in
 click==8.1.3
     # via geomet
 clustershell==1.9.1
@@ -87,13 +87,12 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
     #   -r requirements/base.txt
-croniter==0.3.29 ; sys_platform != "win32"
+croniter==1.3.15 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
     #   etcd3-py
     #   moto
     #   paramiko
@@ -105,7 +104,6 @@ distro==1.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
     #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
     #   pytest-skip-markers
 dnspython==2.3.0
     # via
@@ -154,7 +152,7 @@ immutables==0.15
 importlib-metadata==6.6.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 inflect==6.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
@@ -336,7 +334,7 @@ pynacl==1.5.0
 pyopenssl==23.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
     #   etcd3-py
 pyparsing==3.0.9
     # via junos-eznc
@@ -384,7 +382,7 @@ pytest==7.3.2
 python-dateutil==2.8.2
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
     #   botocore
     #   croniter
     #   kubernetes
@@ -395,7 +393,7 @@ python-etcd==0.4.5
 python-gnupg==0.5.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 pytz==2023.3
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
@@ -451,7 +449,7 @@ semantic-version==2.10.0
 setproctitle==1.3.2
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 six==1.16.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
@@ -490,7 +488,7 @@ textfsm==1.1.3
 timelib==0.3.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
@@ -558,7 +556,7 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
     #   cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
     #   importlib-metadata

requirements/static/ci/py3.10/linux.txt

@@ -91,8 +91,8 @@ cheroot==10.0.0
 cherrypy==18.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/static/pkg/linux.in
 click==8.1.3
     # via geomet
 clustershell==1.9.1
@@ -101,13 +101,12 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
     #   -r requirements/base.txt
-croniter==0.3.29 ; sys_platform != "win32"
+croniter==1.3.15 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/linux.in
     #   ansible-core
     #   etcd3-py
     #   moto
@@ -178,7 +177,7 @@ immutables==0.15
 importlib-metadata==6.6.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 inflect==6.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
@@ -370,7 +369,7 @@ pynacl==1.5.0
 pyopenssl==23.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
     #   etcd3-py
 pyparsing==3.0.9
     # via junos-eznc
@@ -420,7 +419,7 @@ python-consul==1.1.0
 python-dateutil==2.8.2
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
     #   botocore
     #   croniter
     #   kubernetes
@@ -431,7 +430,7 @@ python-etcd==0.4.5
 python-gnupg==0.5.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 python-telegram-bot==20.3
     # via -r requirements/static/ci/linux.in
 pytz==2023.3
@@ -485,10 +484,10 @@ responses==0.23.1
     # via moto
 rfc3987==1.3.8
     # via -r requirements/static/ci/common.in
-rpm-vercmp==0.1.2
+rpm-vercmp==0.1.2 ; sys_platform == "linux"
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 rsa==4.9
     # via google-auth
 s3transfer==0.6.1
@@ -503,7 +502,7 @@ semantic-version==2.10.0
 setproctitle==1.3.2
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 six==1.16.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
@@ -552,7 +551,7 @@ textfsm==1.1.3
 timelib==0.3.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
@@ -622,7 +621,7 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
     #   cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
     #   importlib-metadata

requirements/static/ci/py3.10/windows.txt

@@ -44,14 +44,12 @@ certifi==2023.07.22
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
     #   kubernetes
     #   requests
 cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
     #   clr-loader
     #   cryptography
     #   pygit2
@@ -70,8 +68,8 @@ cheroot==10.0.0
 cherrypy==18.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
 click==8.1.3
     # via geomet
 clr-loader==0.2.4
@@ -91,8 +89,7 @@ contextvars==2.4
 cryptography==41.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/windows.txt
     #   etcd3-py
     #   moto
     #   pyopenssl
@@ -133,11 +130,11 @@ gitdb==4.0.10
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
     #   gitpython
-gitpython==3.1.40
+gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
 google-auth==2.19.1
     # via kubernetes
 idna==3.4
@@ -153,7 +150,7 @@ immutables==0.15
 importlib-metadata==6.6.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 inflect==6.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
@@ -204,10 +201,10 @@ looseversion==1.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
     #   -r requirements/base.txt
-lxml==4.9.2
+lxml==4.9.2 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   xmldiff
 mako==1.2.4
     # via -r requirements/static/ci/common.in
@@ -270,8 +267,6 @@ pyasn1-modules==0.3.0
     # via google-auth
 pyasn1==0.4.8
     # via
-    #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/windows.txt
     #   pyasn1-modules
     #   rsa
 pycparser==2.21
@@ -288,20 +283,20 @@ pydantic==1.10.8
     #   inflect
 pygit2==1.13.1
     # via -r requirements/static/ci/windows.in
-pymssql==2.2.7
+pymssql==2.2.7 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
-pymysql==1.1.0
+pymysql==1.1.0 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 pynacl==1.5.0
     # via -r requirements/static/ci/common.in
 pyopenssl==23.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   etcd3-py
 pyrsistent==0.19.3
     # via jsonschema
@@ -345,7 +340,7 @@ pytest==7.3.2
 python-dateutil==2.8.2
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   botocore
     #   kubernetes
     #   moto
@@ -354,21 +349,21 @@ python-etcd==0.4.5
 python-gnupg==0.5.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
-pythonnet==3.0.1
+pythonnet==3.0.1 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 pytz==2023.3
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
     #   tempora
 pyvmomi==8.0.1.0.1
     # via -r requirements/static/ci/common.in
-pywin32==306
+pywin32==306 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   docker
     #   pytest-skip-markers
     #   wmi
@@ -395,7 +390,6 @@ requests==2.31.0
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
     #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
     #   docker
     #   etcd3-py
     #   kubernetes
@@ -418,7 +412,7 @@ semantic-version==2.10.0
 setproctitle==1.3.2
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 six==1.15.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
@@ -449,7 +443,7 @@ tempora==5.3.0
 timelib==0.3.0
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
@@ -469,7 +463,6 @@ typing-extensions==4.8.0
 urllib3==1.26.18
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/windows.txt
     #   botocore
     #   docker
     #   google-auth
@@ -493,14 +486,10 @@ werkzeug==3.0.1
     # via
     #   moto
     #   pytest-httpserver
-wheel==0.38.4
+wmi==1.5.1 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
-wmi==1.5.1
-    # via
-    #   -c requirements/static/ci/../pkg/py3.10/windows.txt
-    #   -r requirements/windows.txt
 xmldiff==2.6.3
     # via -r requirements/static/ci/common.in
 xmltodict==0.13.0
@@ -515,7 +504,7 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
     #   cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
     #   importlib-metadata

requirements/static/ci/py3.11/darwin.txt

@@ -8,10 +8,10 @@ aiohttp==3.8.5
     # via etcd3-py
 aiosignal==1.3.1
     # via aiohttp
-apache-libcloud==3.7.0 ; sys_platform != "win32"
+apache-libcloud==3.7.0 ; sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
 asn1crypto==1.5.1
     # via
@@ -81,7 +81,7 @@ cheroot==10.0.0
 cherrypy==18.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
 click==8.1.3
     # via geomet
@@ -96,8 +96,7 @@ croniter==1.3.15 ; sys_platform != "win32"
 cryptography==41.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/darwin.txt
     #   etcd3-py
     #   moto
     #   paramiko
@@ -138,10 +137,10 @@ gitdb==4.0.10
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
     #   gitpython
-gitpython==3.1.40
+gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
 google-auth==2.19.1
     # via kubernetes
@@ -150,7 +149,6 @@ hglib==2.6.2
 idna==3.4
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
-    #   -r requirements/darwin.txt
     #   etcd3-py
     #   requests
     #   yarl
@@ -158,6 +156,10 @@ immutables==0.15
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
     #   contextvars
+importlib-metadata==6.6.0
+    # via
+    #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
+    #   -r requirements/base.txt
 inflect==6.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
@@ -212,10 +214,10 @@ keyring==5.7.1
     # via -r requirements/static/ci/common.in
 kubernetes==3.0.0
     # via -r requirements/static/ci/common.in
-linode-python==1.1.1
+linode-python==1.1.1 ; sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
 looseversion==1.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
@@ -313,8 +315,6 @@ pyasn1-modules==0.3.0
     # via google-auth
 pyasn1==0.4.8
     # via
-    #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
-    #   -r requirements/darwin.txt
     #   pyasn1-modules
     #   rsa
 pycparser==2.21
@@ -340,7 +340,7 @@ pynacl==1.5.0
 pyopenssl==23.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
     #   etcd3-py
 pyparsing==3.0.9
     # via junos-eznc
@@ -388,7 +388,7 @@ pytest==7.3.2
 python-dateutil==2.8.2
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
     #   botocore
     #   croniter
     #   kubernetes
@@ -399,7 +399,7 @@ python-etcd==0.4.5
 python-gnupg==0.5.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
 pytz==2023.3
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
@@ -456,7 +456,7 @@ semantic-version==2.10.0
 setproctitle==1.3.2
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
 six==1.16.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
@@ -496,7 +496,7 @@ textfsm==1.1.3
 timelib==0.3.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
 tornado==6.3.3
@@ -536,10 +536,10 @@ virtualenv==20.23.0
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-vultr==1.0.1
+vultr==1.0.1 ; sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
 watchdog==3.0.0
     # via -r requirements/static/ci/common.in
 websocket-client==0.40.0
@@ -566,6 +566,10 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
     #   cherrypy
+zipp==3.16.2
+    # via
+    #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
+    #   importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements/static/ci/py3.11/freebsd.txt

@@ -77,8 +77,8 @@ cheroot==10.0.0
 cherrypy==18.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/freebsd.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/static/pkg/freebsd.in
 click==8.1.3
     # via geomet
 clustershell==1.9.1
@@ -92,8 +92,7 @@ croniter==1.3.15 ; sys_platform != "win32"
 cryptography==41.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.11/freebsd.txt
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
     #   etcd3-py
     #   moto
     #   paramiko
@@ -105,7 +104,6 @@ distro==1.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/freebsd.txt
     #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
     #   pytest-skip-markers
 dnspython==2.3.0
     # via
@@ -152,7 +150,7 @@ immutables==0.15
 importlib-metadata==6.6.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 inflect==6.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.11/freebsd.txt
@@ -334,7 +332,7 @@ pynacl==1.5.0
 pyopenssl==23.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
     #   etcd3-py
 pyparsing==3.0.9
     # via junos-eznc
@@ -382,7 +380,7 @@ pytest==7.3.2
 python-dateutil==2.8.2
     # via
     #   -c requirements/static/ci/../pkg/py3.11/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
     #   botocore
     #   croniter
     #   kubernetes
@@ -393,7 +391,7 @@ python-etcd==0.4.5
 python-gnupg==0.5.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 pytz==2023.3
     # via
     #   -c requirements/static/ci/../pkg/py3.11/freebsd.txt
@@ -449,7 +447,7 @@ semantic-version==2.10.0
 setproctitle==1.3.2
     # via
     #   -c requirements/static/ci/../pkg/py3.11/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 six==1.16.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/freebsd.txt
@@ -488,7 +486,7 @@ textfsm==1.1.3
 timelib==0.3.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
 tornado==6.3.3
@@ -554,7 +552,7 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/../pkg/py3.11/freebsd.txt
     #   cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   -c requirements/static/ci/../pkg/py3.11/freebsd.txt
     #   importlib-metadata

requirements/static/ci/py3.11/linux.txt

@@ -91,8 +91,8 @@ cheroot==10.0.0
 cherrypy==18.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/static/pkg/linux.in
 click==8.1.3
     # via geomet
 clustershell==1.9.1
@@ -106,8 +106,7 @@ croniter==1.3.15 ; sys_platform != "win32"
 cryptography==41.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/linux.in
     #   ansible-core
     #   etcd3-py
     #   moto
@@ -174,7 +173,7 @@ immutables==0.15
 importlib-metadata==6.6.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 inflect==6.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
@@ -366,7 +365,7 @@ pynacl==1.5.0
 pyopenssl==23.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
     #   etcd3-py
 pyparsing==3.0.9
     # via junos-eznc
@@ -416,7 +415,7 @@ python-consul==1.1.0
 python-dateutil==2.8.2
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
     #   botocore
     #   croniter
     #   kubernetes
@@ -427,7 +426,7 @@ python-etcd==0.4.5
 python-gnupg==0.5.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 python-telegram-bot==20.3
     # via -r requirements/static/ci/linux.in
 pytz==2023.3
@@ -481,10 +480,10 @@ responses==0.23.1
     # via moto
 rfc3987==1.3.8
     # via -r requirements/static/ci/common.in
-rpm-vercmp==0.1.2
+rpm-vercmp==0.1.2 ; sys_platform == "linux"
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 rsa==4.9
     # via google-auth
 s3transfer==0.6.1
@@ -499,7 +498,7 @@ semantic-version==2.10.0
 setproctitle==1.3.2
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 six==1.16.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
@@ -548,7 +547,7 @@ textfsm==1.1.3
 timelib==0.3.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
 tornado==6.3.3
@@ -616,7 +615,7 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
     #   cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
     #   importlib-metadata

requirements/static/ci/py3.11/windows.txt

@@ -44,14 +44,12 @@ certifi==2023.07.22
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
     #   kubernetes
     #   requests
 cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
     #   clr-loader
     #   cryptography
     #   pygit2
@@ -70,8 +68,8 @@ cheroot==10.0.0
 cherrypy==18.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
 click==8.1.3
     # via geomet
 clr-loader==0.2.4
@@ -91,8 +89,7 @@ contextvars==2.4
 cryptography==41.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/windows.txt
     #   etcd3-py
     #   moto
     #   pyopenssl
@@ -131,11 +128,11 @@ gitdb==4.0.10
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
     #   gitpython
-gitpython==3.1.40
+gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
 google-auth==2.19.1
     # via kubernetes
 idna==3.4
@@ -151,7 +148,7 @@ immutables==0.15
 importlib-metadata==6.6.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 inflect==6.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
@@ -202,10 +199,10 @@ looseversion==1.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
     #   -r requirements/base.txt
-lxml==4.9.2
+lxml==4.9.2 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   xmldiff
 mako==1.2.4
     # via -r requirements/static/ci/common.in
@@ -268,8 +265,6 @@ pyasn1-modules==0.3.0
     # via google-auth
 pyasn1==0.4.8
     # via
-    #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/windows.txt
     #   pyasn1-modules
     #   rsa
 pycparser==2.21
@@ -286,20 +281,20 @@ pydantic==1.10.8
     #   inflect
 pygit2==1.13.1
     # via -r requirements/static/ci/windows.in
-pymssql==2.2.7
+pymssql==2.2.7 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
-pymysql==1.1.0
+pymysql==1.1.0 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 pynacl==1.5.0
     # via -r requirements/static/ci/common.in
 pyopenssl==23.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   etcd3-py
 pyrsistent==0.19.3
     # via jsonschema
@@ -343,7 +338,7 @@ pytest==7.3.2
 python-dateutil==2.8.2
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   botocore
     #   kubernetes
     #   moto
@@ -352,21 +347,21 @@ python-etcd==0.4.5
 python-gnupg==0.5.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
-pythonnet==3.0.1
+pythonnet==3.0.1 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 pytz==2023.3
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
     #   tempora
 pyvmomi==8.0.1.0.1
     # via -r requirements/static/ci/common.in
-pywin32==306
+pywin32==306 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   docker
     #   pytest-skip-markers
     #   wmi
@@ -393,7 +388,6 @@ requests==2.31.0
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
     #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
     #   docker
     #   etcd3-py
     #   kubernetes
@@ -416,7 +410,7 @@ semantic-version==2.10.0
 setproctitle==1.3.2
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 six==1.15.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
@@ -447,7 +441,7 @@ tempora==5.3.0
 timelib==0.3.0
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
 tornado==6.3.3
@@ -465,7 +459,6 @@ typing-extensions==4.8.0
 urllib3==1.26.18
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/windows.txt
     #   botocore
     #   docker
     #   google-auth
@@ -489,14 +482,10 @@ werkzeug==3.0.1
     # via
     #   moto
     #   pytest-httpserver
-wheel==0.38.4
+wmi==1.5.1 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
-wmi==1.5.1
-    # via
-    #   -c requirements/static/ci/../pkg/py3.11/windows.txt
-    #   -r requirements/windows.txt
 xmldiff==2.6.3
     # via -r requirements/static/ci/common.in
 xmltodict==0.13.0
@@ -511,7 +500,7 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
     #   cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
     #   importlib-metadata

requirements/static/ci/py3.8/docs.txt

@@ -169,7 +169,7 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/py3.8/linux.txt
     #   cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   -c requirements/static/ci/py3.8/linux.txt
     #   importlib-metadata

requirements/static/ci/py3.8/freebsd.txt

@@ -77,8 +77,8 @@ cheroot==10.0.0
 cherrypy==18.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/static/pkg/freebsd.in
 click==8.1.3
     # via geomet
 clustershell==1.9.1
@@ -87,13 +87,12 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
     #   -r requirements/base.txt
-croniter==0.3.29 ; sys_platform != "win32"
+croniter==1.3.15 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
     #   etcd3-py
     #   moto
     #   paramiko
@@ -105,7 +104,6 @@ distro==1.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
     #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
     #   pytest-skip-markers
 dnspython==2.3.0
     # via
@@ -154,7 +152,7 @@ immutables==0.15
 importlib-metadata==6.6.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 importlib-resources==5.12.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
@@ -340,7 +338,7 @@ pynacl==1.5.0
 pyopenssl==23.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
     #   etcd3-py
 pyparsing==3.0.9
     # via junos-eznc
@@ -388,7 +386,7 @@ pytest==7.3.2
 python-dateutil==2.8.2
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
     #   botocore
     #   croniter
     #   kubernetes
@@ -399,7 +397,7 @@ python-etcd==0.4.5
 python-gnupg==0.5.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 pytz==2023.3
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
@@ -455,7 +453,7 @@ semantic-version==2.10.0
 setproctitle==1.3.2
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 six==1.16.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
@@ -494,7 +492,7 @@ textfsm==1.1.3
 timelib==0.3.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
@@ -562,7 +560,7 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
     #   cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
     #   importlib-metadata

requirements/static/ci/py3.8/linux.txt

@@ -91,8 +91,8 @@ cheroot==10.0.0
 cherrypy==18.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/static/pkg/linux.in
 click==8.1.3
     # via geomet
 clustershell==1.9.1
@@ -101,13 +101,12 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
     #   -r requirements/base.txt
-croniter==0.3.29 ; sys_platform != "win32"
+croniter==1.3.15 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/linux.in
     #   ansible-core
     #   etcd3-py
     #   moto
@@ -178,7 +177,7 @@ immutables==0.15
 importlib-metadata==6.6.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 importlib-resources==5.12.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
@@ -374,7 +373,7 @@ pynacl==1.5.0
 pyopenssl==23.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
     #   etcd3-py
 pyparsing==3.0.9
     # via junos-eznc
@@ -424,7 +423,7 @@ python-consul==1.1.0
 python-dateutil==2.8.2
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
     #   botocore
     #   croniter
     #   kubernetes
@@ -435,7 +434,7 @@ python-etcd==0.4.5
 python-gnupg==0.5.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 python-telegram-bot==20.3
     # via -r requirements/static/ci/linux.in
 pytz==2023.3
@@ -489,10 +488,10 @@ responses==0.23.1
     # via moto
 rfc3987==1.3.8
     # via -r requirements/static/ci/common.in
-rpm-vercmp==0.1.2
+rpm-vercmp==0.1.2 ; sys_platform == "linux"
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 rsa==4.9
     # via google-auth
 s3transfer==0.6.1
@@ -507,7 +506,7 @@ semantic-version==2.10.0
 setproctitle==1.3.2
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 six==1.16.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
@@ -556,7 +555,7 @@ textfsm==1.1.3
 timelib==0.3.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
@@ -626,7 +625,7 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
     #   cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
     #   importlib-metadata

requirements/static/ci/py3.8/windows.txt

@@ -44,14 +44,12 @@ certifi==2023.07.22
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
     #   kubernetes
     #   requests
 cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
     #   clr-loader
     #   cryptography
     #   pygit2
@@ -70,8 +68,8 @@ cheroot==10.0.0
 cherrypy==18.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
 click==8.1.3
     # via geomet
 clr-loader==0.2.4
@@ -91,8 +89,7 @@ contextvars==2.4
 cryptography==41.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/windows.txt
     #   etcd3-py
     #   moto
     #   pyopenssl
@@ -133,11 +130,11 @@ gitdb==4.0.10
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
     #   gitpython
-gitpython==3.1.40
+gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
 google-auth==2.19.1
     # via kubernetes
 idna==3.4
@@ -153,7 +150,7 @@ immutables==0.15
 importlib-metadata==6.6.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 importlib-resources==5.12.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
@@ -208,10 +205,10 @@ looseversion==1.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
     #   -r requirements/base.txt
-lxml==4.9.2
+lxml==4.9.2 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   xmldiff
 mako==1.2.4
     # via -r requirements/static/ci/common.in
@@ -274,8 +271,6 @@ pyasn1-modules==0.3.0
     # via google-auth
 pyasn1==0.4.8
     # via
-    #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/windows.txt
     #   pyasn1-modules
     #   rsa
 pycparser==2.21
@@ -292,20 +287,20 @@ pydantic==1.10.8
     #   inflect
 pygit2==1.13.1
     # via -r requirements/static/ci/windows.in
-pymssql==2.2.7
+pymssql==2.2.7 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
-pymysql==1.1.0
+pymysql==1.1.0 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 pynacl==1.5.0
     # via -r requirements/static/ci/common.in
 pyopenssl==23.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   etcd3-py
 pyrsistent==0.19.3
     # via jsonschema
@@ -349,7 +344,7 @@ pytest==7.3.2
 python-dateutil==2.8.2
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   botocore
     #   kubernetes
     #   moto
@@ -358,21 +353,21 @@ python-etcd==0.4.5
 python-gnupg==0.5.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
-pythonnet==3.0.1
+pythonnet==3.0.1 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 pytz==2023.3
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
     #   tempora
 pyvmomi==8.0.1.0.1
     # via -r requirements/static/ci/common.in
-pywin32==306
+pywin32==306 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   cherrypy
     #   docker
     #   pytest-skip-markers
@@ -400,7 +395,6 @@ requests==2.31.0
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
     #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
     #   docker
     #   etcd3-py
     #   kubernetes
@@ -423,7 +417,7 @@ semantic-version==2.10.0
 setproctitle==1.3.2
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 six==1.15.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
@@ -454,7 +448,7 @@ tempora==5.3.0
 timelib==0.3.0
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
@@ -474,7 +468,6 @@ typing-extensions==4.8.0
 urllib3==1.26.18
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/windows.txt
     #   botocore
     #   docker
     #   google-auth
@@ -498,14 +491,10 @@ werkzeug==3.0.1
     # via
     #   moto
     #   pytest-httpserver
-wheel==0.38.4
+wmi==1.5.1 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
-wmi==1.5.1
-    # via
-    #   -c requirements/static/ci/../pkg/py3.8/windows.txt
-    #   -r requirements/windows.txt
 xmldiff==2.6.3
     # via -r requirements/static/ci/common.in
 xmltodict==0.13.0
@@ -520,7 +509,7 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
     #   cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
     #   importlib-metadata

requirements/static/ci/py3.9/darwin.txt

@@ -8,10 +8,10 @@ aiohttp==3.8.5
     # via etcd3-py
 aiosignal==1.3.1
     # via aiohttp
-apache-libcloud==3.7.0 ; sys_platform != "win32"
+apache-libcloud==3.7.0 ; sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
 asn1crypto==1.5.1
     # via
@@ -81,7 +81,7 @@ cheroot==10.0.0
 cherrypy==18.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
 click==8.1.3
     # via geomet
@@ -91,13 +91,12 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
     #   -r requirements/base.txt
-croniter==0.3.29 ; sys_platform != "win32"
+croniter==1.3.15 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/darwin.txt
     #   etcd3-py
     #   moto
     #   paramiko
@@ -140,10 +139,10 @@ gitdb==4.0.10
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
     #   gitpython
-gitpython==3.1.40
+gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
 google-auth==2.19.1
     # via kubernetes
@@ -152,7 +151,6 @@ hglib==2.6.2
 idna==3.4
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
-    #   -r requirements/darwin.txt
     #   etcd3-py
     #   requests
     #   yarl
@@ -160,6 +158,10 @@ immutables==0.15
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
     #   contextvars
+importlib-metadata==6.6.0
+    # via
+    #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
+    #   -r requirements/base.txt
 inflect==6.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
@@ -214,10 +216,10 @@ keyring==5.7.1
     # via -r requirements/static/ci/common.in
 kubernetes==3.0.0
     # via -r requirements/static/ci/common.in
-linode-python==1.1.1
+linode-python==1.1.1 ; sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
 looseversion==1.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
@@ -296,8 +298,6 @@ passlib==1.7.4
     # via -r requirements/static/ci/common.in
 pathspec==0.11.1
     # via yamllint
-pathtools==0.1.2
-    # via watchdog
 platformdirs==3.5.3
     # via virtualenv
 pluggy==1.0.0
@@ -317,8 +317,6 @@ pyasn1-modules==0.3.0
     # via google-auth
 pyasn1==0.4.8
     # via
-    #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
-    #   -r requirements/darwin.txt
     #   pyasn1-modules
     #   rsa
 pycparser==2.21
@@ -344,7 +342,7 @@ pynacl==1.5.0
 pyopenssl==23.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
     #   etcd3-py
 pyparsing==3.0.9
     # via junos-eznc
@@ -392,7 +390,7 @@ pytest==7.3.2
 python-dateutil==2.8.2
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
     #   botocore
     #   croniter
     #   kubernetes
@@ -403,7 +401,7 @@ python-etcd==0.4.5
 python-gnupg==0.5.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
 pytz==2023.3
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
@@ -460,7 +458,7 @@ semantic-version==2.10.0
 setproctitle==1.3.2
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
 six==1.16.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
@@ -500,7 +498,7 @@ textfsm==1.1.3
 timelib==0.3.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
@@ -542,11 +540,11 @@ virtualenv==20.23.0
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-vultr==1.0.1
+vultr==1.0.1 ; sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
-    #   -r requirements/darwin.txt
+    #   -r requirements/base.txt
-watchdog==0.10.3
+watchdog==3.0.0
     # via -r requirements/static/ci/common.in
 websocket-client==0.40.0
     # via
@@ -572,6 +570,10 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
     #   cherrypy
+zipp==3.16.2
+    # via
+    #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
+    #   importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements/static/ci/py3.9/docs.txt

@@ -164,7 +164,7 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/py3.9/linux.txt
     #   cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   -c requirements/static/ci/py3.9/linux.txt
     #   importlib-metadata

requirements/static/ci/py3.9/freebsd.txt

@@ -77,8 +77,8 @@ cheroot==10.0.0
 cherrypy==18.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/static/pkg/freebsd.in
 click==8.1.3
     # via geomet
 clustershell==1.9.1
@@ -87,13 +87,12 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
     #   -r requirements/base.txt
-croniter==0.3.29 ; sys_platform != "win32"
+croniter==1.3.15 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
     #   etcd3-py
     #   moto
     #   paramiko
@@ -105,7 +104,6 @@ distro==1.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
     #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
     #   pytest-skip-markers
 dnspython==2.3.0
     # via
@@ -154,7 +152,7 @@ immutables==0.15
 importlib-metadata==6.6.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 inflect==6.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
@@ -336,7 +334,7 @@ pynacl==1.5.0
 pyopenssl==23.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
     #   etcd3-py
 pyparsing==3.0.9
     # via junos-eznc
@@ -384,7 +382,7 @@ pytest==7.3.2
 python-dateutil==2.8.2
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
     #   botocore
     #   croniter
     #   kubernetes
@@ -395,7 +393,7 @@ python-etcd==0.4.5
 python-gnupg==0.5.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 pytz==2023.3
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
@@ -451,7 +449,7 @@ semantic-version==2.10.0
 setproctitle==1.3.2
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 six==1.16.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
@@ -490,7 +488,7 @@ textfsm==1.1.3
 timelib==0.3.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
+    #   -r requirements/base.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
@@ -558,7 +556,7 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
     #   cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
     #   importlib-metadata

requirements/static/ci/py3.9/linux.txt

@@ -91,8 +91,8 @@ cheroot==10.0.0
 cherrypy==18.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/static/pkg/linux.in
 click==8.1.3
     # via geomet
 clustershell==1.9.1
@@ -101,13 +101,12 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
     #   -r requirements/base.txt
-croniter==0.3.29 ; sys_platform != "win32"
+croniter==1.3.15 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/linux.in
     #   ansible-core
     #   etcd3-py
     #   moto
@@ -178,7 +177,7 @@ immutables==0.15
 importlib-metadata==6.6.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 importlib-resources==5.0.7
     # via ansible-core
 inflect==6.0.4
@@ -372,7 +371,7 @@ pynacl==1.5.0
 pyopenssl==23.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
     #   etcd3-py
 pyparsing==3.0.9
     # via junos-eznc
@@ -422,7 +421,7 @@ python-consul==1.1.0
 python-dateutil==2.8.2
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
     #   botocore
     #   croniter
     #   kubernetes
@@ -433,7 +432,7 @@ python-etcd==0.4.5
 python-gnupg==0.5.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 python-telegram-bot==20.3
     # via -r requirements/static/ci/linux.in
 pytz==2023.3
@@ -487,10 +486,10 @@ responses==0.23.1
     # via moto
 rfc3987==1.3.8
     # via -r requirements/static/ci/common.in
-rpm-vercmp==0.1.2
+rpm-vercmp==0.1.2 ; sys_platform == "linux"
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 rsa==4.9
     # via google-auth
 s3transfer==0.6.1
@@ -505,7 +504,7 @@ semantic-version==2.10.0
 setproctitle==1.3.2
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 six==1.16.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
@@ -554,7 +553,7 @@ textfsm==1.1.3
 timelib==0.3.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   -r requirements/static/pkg/linux.in
+    #   -r requirements/base.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
@@ -624,7 +623,7 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
     #   cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
     #   importlib-metadata

requirements/static/ci/py3.9/windows.txt

@@ -44,14 +44,12 @@ certifi==2023.07.22
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
     #   kubernetes
     #   requests
 cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
     #   clr-loader
     #   cryptography
     #   pygit2
@@ -70,8 +68,8 @@ cheroot==10.0.0
 cherrypy==18.8.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
 click==8.1.3
     # via geomet
 clr-loader==0.2.4
@@ -91,8 +89,7 @@ contextvars==2.4
 cryptography==41.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/windows.txt
     #   etcd3-py
     #   moto
     #   pyopenssl
@@ -133,11 +130,11 @@ gitdb==4.0.10
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
     #   gitpython
-gitpython==3.1.40
+gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin"
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
+    #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
 google-auth==2.19.1
     # via kubernetes
 idna==3.4
@@ -153,7 +150,7 @@ immutables==0.15
 importlib-metadata==6.6.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 inflect==6.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
@@ -204,10 +201,10 @@ looseversion==1.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
     #   -r requirements/base.txt
-lxml==4.9.2
+lxml==4.9.2 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   xmldiff
 mako==1.2.4
     # via -r requirements/static/ci/common.in
@@ -270,8 +267,6 @@ pyasn1-modules==0.3.0
     # via google-auth
 pyasn1==0.4.8
     # via
-    #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/windows.txt
     #   pyasn1-modules
     #   rsa
 pycparser==2.21
@@ -288,20 +283,20 @@ pydantic==1.10.8
     #   inflect
 pygit2==1.13.1
     # via -r requirements/static/ci/windows.in
-pymssql==2.2.7
+pymssql==2.2.7 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
-pymysql==1.1.0
+pymysql==1.1.0 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 pynacl==1.5.0
     # via -r requirements/static/ci/common.in
 pyopenssl==23.2.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   etcd3-py
 pyrsistent==0.19.3
     # via jsonschema
@@ -345,7 +340,7 @@ pytest==7.3.2
 python-dateutil==2.8.2
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   botocore
     #   kubernetes
     #   moto
@@ -354,21 +349,21 @@ python-etcd==0.4.5
 python-gnupg==0.5.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
-pythonnet==3.0.1
+pythonnet==3.0.1 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 pytz==2023.3
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
     #   tempora
 pyvmomi==8.0.1.0.1
     # via -r requirements/static/ci/common.in
-pywin32==306
+pywin32==306 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   cherrypy
     #   docker
     #   pytest-skip-markers
@@ -396,7 +391,6 @@ requests==2.31.0
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
     #   -r requirements/base.txt
     #   -r requirements/static/ci/common.in
-    #   -r requirements/windows.txt
     #   docker
     #   etcd3-py
     #   kubernetes
@@ -419,7 +413,7 @@ semantic-version==2.10.0
 setproctitle==1.3.2
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 six==1.15.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
@@ -450,7 +444,7 @@ tempora==5.3.0
 timelib==0.3.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
@@ -470,7 +464,6 @@ typing-extensions==4.8.0
 urllib3==1.26.18
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/windows.txt
     #   botocore
     #   docker
     #   google-auth
@@ -494,14 +487,10 @@ werkzeug==3.0.1
     # via
     #   moto
     #   pytest-httpserver
-wheel==0.38.4
+wmi==1.5.1 ; sys_platform == "win32"
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
-wmi==1.5.1
-    # via
-    #   -c requirements/static/ci/../pkg/py3.9/windows.txt
-    #   -r requirements/windows.txt
 xmldiff==2.6.3
     # via -r requirements/static/ci/common.in
 xmltodict==0.13.0
@@ -516,7 +505,7 @@ zc.lockfile==3.0.post1
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
     #   cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
     #   importlib-metadata

requirements/static/pkg/darwin.in

@@ -1,2 +1,3 @@
 # This file only exists to trigger the right static compiled requirements destination
-# Don't add any requirements here, add them in requirements/darwin.txt
+# Don't add any requirements here, add them in requirements/base.txt
+# If they are macOS specific, place "; sys_platform == 'darwin'" in front of the requirement.

requirements/static/pkg/freebsd.in

@@ -1,11 +1,2 @@
 # This file only exists to trigger the right static compiled requirements destination
 # Any non hard dependencies of Salt for FreeBSD can go here
-cherrypy
-cryptography>=41.0.3
-pyopenssl>=23.2.0
-python-dateutil>=2.8.0
-python-gnupg>=0.4.4
-setproctitle>=1.2.3
-timelib>=0.2.5
-distro>=1.3.0
-importlib-metadata>=3.3.0

requirements/static/pkg/linux.in

@@ -1,11 +1,3 @@
 # This file only exists to trigger the right static compiled requirements destination.
-# Any non hard dependencies of Salt for linux can go here
+# Don't add any requirements here, add them in requirements/base.txt
-cherrypy
+# If they are linux specific, place "; sys_platform == 'linux'" in front of the requirement.
-pyopenssl>=23.2.0
-python-dateutil>=2.8.0
-python-gnupg>=0.4.4
-rpm-vercmp
-setproctitle>=1.2.3
-timelib>=0.2.5
-importlib-metadata>=3.3.0
-cryptography>=41.0.3

requirements/static/pkg/py3.10/darwin.txt

@@ -4,8 +4,8 @@
 #
 #    pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.10/darwin.txt requirements/darwin.txt requirements/static/pkg/darwin.in
 #
-apache-libcloud==3.7.0
+apache-libcloud==3.7.0 ; sys_platform == "darwin"
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 autocommand==2.2.2
     # via jaraco.text
 certifi==2023.07.22
@@ -17,26 +17,25 @@ charset-normalizer==3.2.0
 cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.4
     # via
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/darwin.txt
     #   pyopenssl
 distro==1.8.0
     # via -r requirements/base.txt
 gitdb==4.0.10
     # via gitpython
-gitpython==3.1.40
+gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin"
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 idna==3.4
-    # via
+    # via requests
-    #   -r requirements/darwin.txt
-    #   requests
 immutables==0.15
     # via contextvars
+importlib-metadata==6.6.0
+    # via -r requirements/base.txt
 inflect==6.0.4
     # via jaraco.text
 jaraco.collections==4.1.0
@@ -54,8 +53,8 @@ jinja2==3.1.2
     # via -r requirements/base.txt
 jmespath==1.0.1
     # via -r requirements/base.txt
-linode-python==1.1.1
+linode-python==1.1.1 ; sys_platform == "darwin"
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 looseversion==1.2.0
     # via -r requirements/base.txt
 markupsafe==2.1.2
@@ -76,8 +75,6 @@ portend==3.1.0
     # via cherrypy
 psutil==5.9.5
     # via -r requirements/base.txt
-pyasn1==0.4.8
-    # via -r requirements/darwin.txt
 pycparser==2.21
     # via cffi
 pycryptodomex==3.9.8
@@ -85,11 +82,11 @@ pycryptodomex==3.9.8
 pydantic==1.10.8
     # via inflect
 pyopenssl==23.2.0
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 python-dateutil==2.8.2
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 python-gnupg==0.5.0
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 pytz==2023.3
     # via tempora
 pyyaml==6.0.1
@@ -102,7 +99,7 @@ requests==2.31.0
     #   apache-libcloud
     #   vultr
 setproctitle==1.3.2
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 six==1.16.0
     # via python-dateutil
 smmap==5.0.0
@@ -110,17 +107,19 @@ smmap==5.0.0
 tempora==5.3.0
     # via portend
 timelib==0.3.0
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 tornado==6.3.3
     # via -r requirements/base.txt
 typing-extensions==4.8.0
     # via pydantic
 urllib3==1.26.18
     # via requests
-vultr==1.0.1
+vultr==1.0.1 ; sys_platform == "darwin"
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 zc.lockfile==3.0.post1
     # via cherrypy
+zipp==3.16.2
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements/static/pkg/py3.10/freebsd.txt

@@ -15,24 +15,21 @@ charset-normalizer==3.2.0
 cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.4
     # via
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
     #   pyopenssl
 distro==1.8.0
-    # via
+    # via -r requirements/base.txt
-    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
 idna==3.4
     # via requests
 immutables==0.15
     # via contextvars
 importlib-metadata==6.6.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 inflect==6.0.4
     # via jaraco.text
 jaraco.collections==4.1.0
@@ -77,11 +74,11 @@ pycryptodomex==3.9.8
 pydantic==1.10.8
     # via inflect
 pyopenssl==23.2.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 python-dateutil==2.8.2
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 python-gnupg==0.5.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 pytz==2023.3
     # via tempora
 pyyaml==6.0.1
@@ -91,13 +88,13 @@ pyzmq==25.1.0
 requests==2.31.0
     # via -r requirements/base.txt
 setproctitle==1.3.2
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 six==1.16.0
     # via python-dateutil
 tempora==5.3.0
     # via portend
 timelib==0.3.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 tornado==6.3.3
     # via -r requirements/base.txt
 typing-extensions==4.8.0
@@ -106,7 +103,7 @@ urllib3==1.26.18
     # via requests
 zc.lockfile==3.0.post1
     # via cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/static/pkg/py3.10/linux.txt

@@ -15,13 +15,12 @@ charset-normalizer==3.2.0
 cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.4
     # via
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/linux.in
     #   pyopenssl
 distro==1.8.0
     # via -r requirements/base.txt
@@ -30,7 +29,7 @@ idna==3.4
 immutables==0.15
     # via contextvars
 importlib-metadata==6.6.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 inflect==6.0.4
     # via jaraco.text
 jaraco.collections==4.1.0
@@ -75,11 +74,11 @@ pycryptodomex==3.9.8
 pydantic==1.10.8
     # via inflect
 pyopenssl==23.2.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 python-dateutil==2.8.2
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 python-gnupg==0.5.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 pytz==2023.3
     # via tempora
 pyyaml==6.0.1
@@ -88,16 +87,16 @@ pyzmq==25.1.0
     # via -r requirements/zeromq.txt
 requests==2.31.0
     # via -r requirements/base.txt
-rpm-vercmp==0.1.2
+rpm-vercmp==0.1.2 ; sys_platform == "linux"
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 setproctitle==1.3.2
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 six==1.16.0
     # via python-dateutil
 tempora==5.3.0
     # via portend
 timelib==0.3.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 tornado==6.3.3
     # via -r requirements/base.txt
 typing-extensions==4.8.0
@@ -106,7 +105,7 @@ urllib3==1.26.18
     # via requests
 zc.lockfile==3.0.post1
     # via cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/static/pkg/py3.10/windows.txt

@@ -7,12 +7,9 @@
 autocommand==2.2.2
     # via jaraco.text
 certifi==2023.07.22
-    # via
+    # via requests
-    #   -r requirements/windows.txt
-    #   requests
 cffi==1.14.6
     # via
-    #   -r requirements/windows.txt
     #   clr-loader
     #   cryptography
 charset-normalizer==3.2.0
@@ -20,28 +17,27 @@ charset-normalizer==3.2.0
 cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 clr-loader==0.2.4
     # via pythonnet
 contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.4
     # via
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/windows.txt
     #   pyopenssl
 distro==1.8.0
     # via -r requirements/base.txt
 gitdb==4.0.10
     # via gitpython
-gitpython==3.1.40
+gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 idna==3.4
     # via requests
 immutables==0.15
     # via contextvars
 importlib-metadata==6.6.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 inflect==6.0.4
     # via jaraco.text
 jaraco.collections==4.1.0
@@ -61,8 +57,8 @@ jmespath==1.0.1
     # via -r requirements/base.txt
 looseversion==1.2.0
     # via -r requirements/base.txt
-lxml==4.9.2
+lxml==4.9.2 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 markupsafe==2.1.2
     # via
     #   -r requirements/base.txt
@@ -81,42 +77,38 @@ portend==3.1.0
     # via cherrypy
 psutil==5.8.0
     # via -r requirements/base.txt
-pyasn1==0.4.8
-    # via -r requirements/windows.txt
 pycparser==2.21
     # via cffi
 pycryptodomex==3.9.8
     # via -r requirements/crypto.txt
 pydantic==1.10.8
     # via inflect
-pymssql==2.2.7
+pymssql==2.2.7 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
-pymysql==1.1.0
+pymysql==1.1.0 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 pyopenssl==23.2.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 python-dateutil==2.8.2
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 python-gnupg==0.5.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
-pythonnet==3.0.1
+pythonnet==3.0.1 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 pytz==2023.3
     # via tempora
-pywin32==306
+pywin32==306 ; sys_platform == "win32"
     # via
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   wmi
 pyyaml==6.0.1
     # via -r requirements/base.txt
 pyzmq==25.1.0
     # via -r requirements/zeromq.txt
 requests==2.31.0
-    # via
+    # via -r requirements/base.txt
-    #   -r requirements/base.txt
-    #   -r requirements/windows.txt
 setproctitle==1.3.2
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 six==1.15.0
     # via python-dateutil
 smmap==5.0.0
@@ -124,22 +116,18 @@ smmap==5.0.0
 tempora==5.3.0
     # via portend
 timelib==0.3.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 tornado==6.3.3
     # via -r requirements/base.txt
 typing-extensions==4.8.0
     # via pydantic
 urllib3==1.26.18
-    # via
+    # via requests
-    #   -r requirements/windows.txt
+wmi==1.5.1 ; sys_platform == "win32"
-    #   requests
+    # via -r requirements/base.txt
-wheel==0.38.4
-    # via -r requirements/windows.txt
-wmi==1.5.1
-    # via -r requirements/windows.txt
 zc.lockfile==3.0.post1
     # via cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/static/pkg/py3.11/darwin.txt

@@ -4,8 +4,8 @@
 #
 #    pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.11/darwin.txt requirements/darwin.txt requirements/static/pkg/darwin.in
 #
-apache-libcloud==3.7.0
+apache-libcloud==3.7.0 ; sys_platform == "darwin"
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 autocommand==2.2.2
     # via jaraco.text
 certifi==2023.07.22
@@ -17,26 +17,25 @@ charset-normalizer==3.2.0
 cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.4
     # via
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/darwin.txt
     #   pyopenssl
 distro==1.8.0
     # via -r requirements/base.txt
 gitdb==4.0.10
     # via gitpython
-gitpython==3.1.40
+gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin"
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 idna==3.4
-    # via
+    # via requests
-    #   -r requirements/darwin.txt
-    #   requests
 immutables==0.15
     # via contextvars
+importlib-metadata==6.6.0
+    # via -r requirements/base.txt
 inflect==6.0.4
     # via jaraco.text
 jaraco.collections==4.1.0
@@ -54,8 +53,8 @@ jinja2==3.1.2
     # via -r requirements/base.txt
 jmespath==1.0.1
     # via -r requirements/base.txt
-linode-python==1.1.1
+linode-python==1.1.1 ; sys_platform == "darwin"
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 looseversion==1.2.0
     # via -r requirements/base.txt
 markupsafe==2.1.2
@@ -76,8 +75,6 @@ portend==3.1.0
     # via cherrypy
 psutil==5.9.5
     # via -r requirements/base.txt
-pyasn1==0.4.8
-    # via -r requirements/darwin.txt
 pycparser==2.21
     # via cffi
 pycryptodomex==3.9.8
@@ -85,11 +82,11 @@ pycryptodomex==3.9.8
 pydantic==1.10.8
     # via inflect
 pyopenssl==23.2.0
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 python-dateutil==2.8.2
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 python-gnupg==0.5.0
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 pytz==2023.3
     # via tempora
 pyyaml==6.0.1
@@ -102,7 +99,7 @@ requests==2.31.0
     #   apache-libcloud
     #   vultr
 setproctitle==1.3.2
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 six==1.16.0
     # via python-dateutil
 smmap==5.0.0
@@ -110,17 +107,19 @@ smmap==5.0.0
 tempora==5.3.0
     # via portend
 timelib==0.3.0
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 tornado==6.3.3
     # via -r requirements/base.txt
 typing-extensions==4.8.0
     # via pydantic
 urllib3==1.26.18
     # via requests
-vultr==1.0.1
+vultr==1.0.1 ; sys_platform == "darwin"
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 zc.lockfile==3.0.post1
     # via cherrypy
+zipp==3.16.2
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements/static/pkg/py3.11/freebsd.txt

@@ -15,24 +15,21 @@ charset-normalizer==3.2.0
 cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.4
     # via
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
     #   pyopenssl
 distro==1.8.0
-    # via
+    # via -r requirements/base.txt
-    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
 idna==3.4
     # via requests
 immutables==0.15
     # via contextvars
 importlib-metadata==6.6.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 inflect==6.0.4
     # via jaraco.text
 jaraco.collections==4.1.0
@@ -77,11 +74,11 @@ pycryptodomex==3.9.8
 pydantic==1.10.8
     # via inflect
 pyopenssl==23.2.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 python-dateutil==2.8.2
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 python-gnupg==0.5.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 pytz==2023.3
     # via tempora
 pyyaml==6.0.1
@@ -91,13 +88,13 @@ pyzmq==25.1.0
 requests==2.31.0
     # via -r requirements/base.txt
 setproctitle==1.3.2
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 six==1.16.0
     # via python-dateutil
 tempora==5.3.0
     # via portend
 timelib==0.3.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 tornado==6.3.3
     # via -r requirements/base.txt
 typing-extensions==4.8.0
@@ -106,7 +103,7 @@ urllib3==1.26.18
     # via requests
 zc.lockfile==3.0.post1
     # via cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/static/pkg/py3.11/linux.txt

@@ -15,13 +15,12 @@ charset-normalizer==3.2.0
 cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.4
     # via
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/linux.in
     #   pyopenssl
 distro==1.8.0
     # via -r requirements/base.txt
@@ -30,7 +29,7 @@ idna==3.4
 immutables==0.15
     # via contextvars
 importlib-metadata==6.6.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 inflect==6.0.4
     # via jaraco.text
 jaraco.collections==4.1.0
@@ -75,11 +74,11 @@ pycryptodomex==3.9.8
 pydantic==1.10.8
     # via inflect
 pyopenssl==23.2.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 python-dateutil==2.8.2
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 python-gnupg==0.5.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 pytz==2023.3
     # via tempora
 pyyaml==6.0.1
@@ -88,16 +87,16 @@ pyzmq==25.1.0
     # via -r requirements/zeromq.txt
 requests==2.31.0
     # via -r requirements/base.txt
-rpm-vercmp==0.1.2
+rpm-vercmp==0.1.2 ; sys_platform == "linux"
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 setproctitle==1.3.2
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 six==1.16.0
     # via python-dateutil
 tempora==5.3.0
     # via portend
 timelib==0.3.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 tornado==6.3.3
     # via -r requirements/base.txt
 typing-extensions==4.8.0
@@ -106,7 +105,7 @@ urllib3==1.26.18
     # via requests
 zc.lockfile==3.0.post1
     # via cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/static/pkg/py3.11/windows.txt

@@ -7,12 +7,9 @@
 autocommand==2.2.2
     # via jaraco.text
 certifi==2023.07.22
-    # via
+    # via requests
-    #   -r requirements/windows.txt
-    #   requests
 cffi==1.14.6
     # via
-    #   -r requirements/windows.txt
     #   clr-loader
     #   cryptography
 charset-normalizer==3.2.0
@@ -20,28 +17,27 @@ charset-normalizer==3.2.0
 cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 clr-loader==0.2.4
     # via pythonnet
 contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.4
     # via
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/windows.txt
     #   pyopenssl
 distro==1.8.0
     # via -r requirements/base.txt
 gitdb==4.0.10
     # via gitpython
-gitpython==3.1.40
+gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 idna==3.4
     # via requests
 immutables==0.15
     # via contextvars
 importlib-metadata==6.6.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 inflect==6.0.4
     # via jaraco.text
 jaraco.collections==4.1.0
@@ -61,8 +57,8 @@ jmespath==1.0.1
     # via -r requirements/base.txt
 looseversion==1.2.0
     # via -r requirements/base.txt
-lxml==4.9.2
+lxml==4.9.2 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 markupsafe==2.1.2
     # via
     #   -r requirements/base.txt
@@ -81,42 +77,38 @@ portend==3.1.0
     # via cherrypy
 psutil==5.8.0
     # via -r requirements/base.txt
-pyasn1==0.4.8
-    # via -r requirements/windows.txt
 pycparser==2.21
     # via cffi
 pycryptodomex==3.9.8
     # via -r requirements/crypto.txt
 pydantic==1.10.8
     # via inflect
-pymssql==2.2.7
+pymssql==2.2.7 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
-pymysql==1.1.0
+pymysql==1.1.0 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 pyopenssl==23.2.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 python-dateutil==2.8.2
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 python-gnupg==0.5.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
-pythonnet==3.0.1
+pythonnet==3.0.1 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 pytz==2023.3
     # via tempora
-pywin32==306
+pywin32==306 ; sys_platform == "win32"
     # via
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   wmi
 pyyaml==6.0.1
     # via -r requirements/base.txt
 pyzmq==25.1.0
     # via -r requirements/zeromq.txt
 requests==2.31.0
-    # via
+    # via -r requirements/base.txt
-    #   -r requirements/base.txt
-    #   -r requirements/windows.txt
 setproctitle==1.3.2
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 six==1.15.0
     # via python-dateutil
 smmap==5.0.0
@@ -124,22 +116,18 @@ smmap==5.0.0
 tempora==5.3.0
     # via portend
 timelib==0.3.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 tornado==6.3.3
     # via -r requirements/base.txt
 typing-extensions==4.8.0
     # via pydantic
 urllib3==1.26.18
-    # via
+    # via requests
-    #   -r requirements/windows.txt
+wmi==1.5.1 ; sys_platform == "win32"
-    #   requests
+    # via -r requirements/base.txt
-wheel==0.38.4
-    # via -r requirements/windows.txt
-wmi==1.5.1
-    # via -r requirements/windows.txt
 zc.lockfile==3.0.post1
     # via cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/static/pkg/py3.8/freebsd.txt

@@ -15,24 +15,21 @@ charset-normalizer==3.2.0
 cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.4
     # via
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
     #   pyopenssl
 distro==1.8.0
-    # via
+    # via -r requirements/base.txt
-    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
 idna==3.4
     # via requests
 immutables==0.15
     # via contextvars
 importlib-metadata==6.6.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 importlib-resources==5.12.0
     # via jaraco.text
 inflect==6.0.4
@@ -79,11 +76,11 @@ pycryptodomex==3.9.8
 pydantic==1.10.8
     # via inflect
 pyopenssl==23.2.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 python-dateutil==2.8.2
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 python-gnupg==0.5.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 pytz==2023.3
     # via tempora
 pyyaml==6.0.1
@@ -93,13 +90,13 @@ pyzmq==25.1.0
 requests==2.31.0
     # via -r requirements/base.txt
 setproctitle==1.3.2
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 six==1.16.0
     # via python-dateutil
 tempora==5.3.0
     # via portend
 timelib==0.3.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 tornado==6.3.3
     # via -r requirements/base.txt
 typing-extensions==4.8.0
@@ -108,7 +105,7 @@ urllib3==1.26.18
     # via requests
 zc.lockfile==3.0.post1
     # via cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   importlib-metadata
     #   importlib-resources

requirements/static/pkg/py3.8/linux.txt

@@ -15,13 +15,12 @@ charset-normalizer==3.2.0
 cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.4
     # via
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/linux.in
     #   pyopenssl
 distro==1.8.0
     # via -r requirements/base.txt
@@ -30,7 +29,7 @@ idna==3.4
 immutables==0.15
     # via contextvars
 importlib-metadata==6.6.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 importlib-resources==5.12.0
     # via jaraco.text
 inflect==6.0.4
@@ -77,11 +76,11 @@ pycryptodomex==3.9.8
 pydantic==1.10.8
     # via inflect
 pyopenssl==23.2.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 python-dateutil==2.8.2
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 python-gnupg==0.5.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 pytz==2023.3
     # via tempora
 pyyaml==6.0.1
@@ -90,16 +89,16 @@ pyzmq==25.1.0
     # via -r requirements/zeromq.txt
 requests==2.31.0
     # via -r requirements/base.txt
-rpm-vercmp==0.1.2
+rpm-vercmp==0.1.2 ; sys_platform == "linux"
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 setproctitle==1.3.2
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 six==1.16.0
     # via python-dateutil
 tempora==5.3.0
     # via portend
 timelib==0.3.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 tornado==6.3.3
     # via -r requirements/base.txt
 typing-extensions==4.8.0
@@ -108,7 +107,7 @@ urllib3==1.26.18
     # via requests
 zc.lockfile==3.0.post1
     # via cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   importlib-metadata
     #   importlib-resources

requirements/static/pkg/py3.8/windows.txt

@@ -7,12 +7,9 @@
 autocommand==2.2.2
     # via jaraco.text
 certifi==2023.07.22
-    # via
+    # via requests
-    #   -r requirements/windows.txt
-    #   requests
 cffi==1.14.6
     # via
-    #   -r requirements/windows.txt
     #   clr-loader
     #   cryptography
 charset-normalizer==3.2.0
@@ -20,28 +17,27 @@ charset-normalizer==3.2.0
 cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 clr-loader==0.2.4
     # via pythonnet
 contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.4
     # via
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/windows.txt
     #   pyopenssl
 distro==1.8.0
     # via -r requirements/base.txt
 gitdb==4.0.10
     # via gitpython
-gitpython==3.1.40
+gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 idna==3.4
     # via requests
 immutables==0.15
     # via contextvars
 importlib-metadata==6.6.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 importlib-resources==5.12.0
     # via jaraco.text
 inflect==6.0.4
@@ -63,8 +59,8 @@ jmespath==1.0.1
     # via -r requirements/base.txt
 looseversion==1.2.0
     # via -r requirements/base.txt
-lxml==4.9.2
+lxml==4.9.2 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 markupsafe==2.1.2
     # via
     #   -r requirements/base.txt
@@ -83,31 +79,29 @@ portend==3.1.0
     # via cherrypy
 psutil==5.8.0
     # via -r requirements/base.txt
-pyasn1==0.4.8
-    # via -r requirements/windows.txt
 pycparser==2.21
     # via cffi
 pycryptodomex==3.9.8
     # via -r requirements/crypto.txt
 pydantic==1.10.8
     # via inflect
-pymssql==2.2.7
+pymssql==2.2.7 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
-pymysql==1.1.0
+pymysql==1.1.0 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 pyopenssl==23.2.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 python-dateutil==2.8.2
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 python-gnupg==0.5.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
-pythonnet==3.0.1
+pythonnet==3.0.1 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 pytz==2023.3
     # via tempora
-pywin32==306
+pywin32==306 ; sys_platform == "win32"
     # via
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   cherrypy
     #   wmi
 pyyaml==6.0.1
@@ -115,11 +109,9 @@ pyyaml==6.0.1
 pyzmq==25.1.0
     # via -r requirements/zeromq.txt
 requests==2.31.0
-    # via
+    # via -r requirements/base.txt
-    #   -r requirements/base.txt
-    #   -r requirements/windows.txt
 setproctitle==1.3.2
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 six==1.15.0
     # via python-dateutil
 smmap==5.0.0
@@ -127,22 +119,18 @@ smmap==5.0.0
 tempora==5.3.0
     # via portend
 timelib==0.3.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 tornado==6.3.3
     # via -r requirements/base.txt
 typing-extensions==4.8.0
     # via pydantic
 urllib3==1.26.18
-    # via
+    # via requests
-    #   -r requirements/windows.txt
+wmi==1.5.1 ; sys_platform == "win32"
-    #   requests
+    # via -r requirements/base.txt
-wheel==0.38.4
-    # via -r requirements/windows.txt
-wmi==1.5.1
-    # via -r requirements/windows.txt
 zc.lockfile==3.0.post1
     # via cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via
     #   importlib-metadata
     #   importlib-resources

requirements/static/pkg/py3.9/darwin.txt

@@ -4,8 +4,8 @@
 #
 #    pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.9/darwin.txt requirements/darwin.txt requirements/static/pkg/darwin.in
 #
-apache-libcloud==3.7.0
+apache-libcloud==3.7.0 ; sys_platform == "darwin"
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 autocommand==2.2.2
     # via jaraco.text
 certifi==2023.07.22
@@ -17,26 +17,25 @@ charset-normalizer==3.2.0
 cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.4
     # via
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/darwin.txt
     #   pyopenssl
 distro==1.8.0
     # via -r requirements/base.txt
 gitdb==4.0.10
     # via gitpython
-gitpython==3.1.40
+gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin"
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 idna==3.4
-    # via
+    # via requests
-    #   -r requirements/darwin.txt
-    #   requests
 immutables==0.15
     # via contextvars
+importlib-metadata==6.6.0
+    # via -r requirements/base.txt
 inflect==6.0.4
     # via jaraco.text
 jaraco.collections==4.1.0
@@ -54,8 +53,8 @@ jinja2==3.1.2
     # via -r requirements/base.txt
 jmespath==1.0.1
     # via -r requirements/base.txt
-linode-python==1.1.1
+linode-python==1.1.1 ; sys_platform == "darwin"
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 looseversion==1.2.0
     # via -r requirements/base.txt
 markupsafe==2.1.2
@@ -76,8 +75,6 @@ portend==3.1.0
     # via cherrypy
 psutil==5.9.5
     # via -r requirements/base.txt
-pyasn1==0.4.8
-    # via -r requirements/darwin.txt
 pycparser==2.21
     # via cffi
 pycryptodomex==3.9.8
@@ -85,11 +82,11 @@ pycryptodomex==3.9.8
 pydantic==1.10.8
     # via inflect
 pyopenssl==23.2.0
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 python-dateutil==2.8.2
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 python-gnupg==0.5.0
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 pytz==2023.3
     # via tempora
 pyyaml==6.0.1
@@ -102,7 +99,7 @@ requests==2.31.0
     #   apache-libcloud
     #   vultr
 setproctitle==1.3.2
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 six==1.16.0
     # via python-dateutil
 smmap==5.0.0
@@ -110,17 +107,19 @@ smmap==5.0.0
 tempora==5.3.0
     # via portend
 timelib==0.3.0
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 tornado==6.3.3
     # via -r requirements/base.txt
 typing-extensions==4.8.0
     # via pydantic
 urllib3==1.26.18
     # via requests
-vultr==1.0.1
+vultr==1.0.1 ; sys_platform == "darwin"
-    # via -r requirements/darwin.txt
+    # via -r requirements/base.txt
 zc.lockfile==3.0.post1
     # via cherrypy
+zipp==3.16.2
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements/static/pkg/py3.9/freebsd.txt

@@ -15,24 +15,21 @@ charset-normalizer==3.2.0
 cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.4
     # via
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
     #   pyopenssl
 distro==1.8.0
-    # via
+    # via -r requirements/base.txt
-    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/freebsd.in
 idna==3.4
     # via requests
 immutables==0.15
     # via contextvars
 importlib-metadata==6.6.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 inflect==6.0.4
     # via jaraco.text
 jaraco.collections==4.1.0
@@ -77,11 +74,11 @@ pycryptodomex==3.9.8
 pydantic==1.10.8
     # via inflect
 pyopenssl==23.2.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 python-dateutil==2.8.2
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 python-gnupg==0.5.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 pytz==2023.3
     # via tempora
 pyyaml==6.0.1
@@ -91,13 +88,13 @@ pyzmq==25.1.0
 requests==2.31.0
     # via -r requirements/base.txt
 setproctitle==1.3.2
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 six==1.16.0
     # via python-dateutil
 tempora==5.3.0
     # via portend
 timelib==0.3.0
-    # via -r requirements/static/pkg/freebsd.in
+    # via -r requirements/base.txt
 tornado==6.3.3
     # via -r requirements/base.txt
 typing-extensions==4.8.0
@@ -106,7 +103,7 @@ urllib3==1.26.18
     # via requests
 zc.lockfile==3.0.post1
     # via cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/static/pkg/py3.9/linux.txt

@@ -15,13 +15,12 @@ charset-normalizer==3.2.0
 cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.4
     # via
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/static/pkg/linux.in
     #   pyopenssl
 distro==1.8.0
     # via -r requirements/base.txt
@@ -30,7 +29,7 @@ idna==3.4
 immutables==0.15
     # via contextvars
 importlib-metadata==6.6.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 inflect==6.0.4
     # via jaraco.text
 jaraco.collections==4.1.0
@@ -75,11 +74,11 @@ pycryptodomex==3.9.8
 pydantic==1.10.8
     # via inflect
 pyopenssl==23.2.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 python-dateutil==2.8.2
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 python-gnupg==0.5.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 pytz==2023.3
     # via tempora
 pyyaml==6.0.1
@@ -88,16 +87,16 @@ pyzmq==25.1.0
     # via -r requirements/zeromq.txt
 requests==2.31.0
     # via -r requirements/base.txt
-rpm-vercmp==0.1.2
+rpm-vercmp==0.1.2 ; sys_platform == "linux"
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 setproctitle==1.3.2
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 six==1.16.0
     # via python-dateutil
 tempora==5.3.0
     # via portend
 timelib==0.3.0
-    # via -r requirements/static/pkg/linux.in
+    # via -r requirements/base.txt
 tornado==6.3.3
     # via -r requirements/base.txt
 typing-extensions==4.8.0
@@ -106,7 +105,7 @@ urllib3==1.26.18
     # via requests
 zc.lockfile==3.0.post1
     # via cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/static/pkg/py3.9/windows.txt

@@ -7,12 +7,9 @@
 autocommand==2.2.2
     # via jaraco.text
 certifi==2023.07.22
-    # via
+    # via requests
-    #   -r requirements/windows.txt
-    #   requests
 cffi==1.14.6
     # via
-    #   -r requirements/windows.txt
     #   clr-loader
     #   cryptography
 charset-normalizer==3.2.0
@@ -20,28 +17,27 @@ charset-normalizer==3.2.0
 cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 clr-loader==0.2.4
     # via pythonnet
 contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.4
     # via
-    #   -r requirements/crypto.txt
+    #   -r requirements/base.txt
-    #   -r requirements/windows.txt
     #   pyopenssl
 distro==1.8.0
     # via -r requirements/base.txt
 gitdb==4.0.10
     # via gitpython
-gitpython==3.1.40
+gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 idna==3.4
     # via requests
 immutables==0.15
     # via contextvars
 importlib-metadata==6.6.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 inflect==6.0.4
     # via jaraco.text
 jaraco.collections==4.1.0
@@ -61,8 +57,8 @@ jmespath==1.0.1
     # via -r requirements/base.txt
 looseversion==1.2.0
     # via -r requirements/base.txt
-lxml==4.9.2
+lxml==4.9.2 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 markupsafe==2.1.2
     # via
     #   -r requirements/base.txt
@@ -81,31 +77,29 @@ portend==3.1.0
     # via cherrypy
 psutil==5.8.0
     # via -r requirements/base.txt
-pyasn1==0.4.8
-    # via -r requirements/windows.txt
 pycparser==2.21
     # via cffi
 pycryptodomex==3.9.8
     # via -r requirements/crypto.txt
 pydantic==1.10.8
     # via inflect
-pymssql==2.2.7
+pymssql==2.2.7 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
-pymysql==1.1.0
+pymysql==1.1.0 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 pyopenssl==23.2.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 python-dateutil==2.8.2
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 python-gnupg==0.5.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
-pythonnet==3.0.1
+pythonnet==3.0.1 ; sys_platform == "win32"
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 pytz==2023.3
     # via tempora
-pywin32==306
+pywin32==306 ; sys_platform == "win32"
     # via
-    #   -r requirements/windows.txt
+    #   -r requirements/base.txt
     #   cherrypy
     #   wmi
 pyyaml==6.0.1
@@ -113,11 +107,9 @@ pyyaml==6.0.1
 pyzmq==25.1.0
     # via -r requirements/zeromq.txt
 requests==2.31.0
-    # via
+    # via -r requirements/base.txt
-    #   -r requirements/base.txt
-    #   -r requirements/windows.txt
 setproctitle==1.3.2
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 six==1.15.0
     # via python-dateutil
 smmap==5.0.0
@@ -125,22 +117,18 @@ smmap==5.0.0
 tempora==5.3.0
     # via portend
 timelib==0.3.0
-    # via -r requirements/windows.txt
+    # via -r requirements/base.txt
 tornado==6.3.3
     # via -r requirements/base.txt
 typing-extensions==4.8.0
     # via pydantic
 urllib3==1.26.18
-    # via
+    # via requests
-    #   -r requirements/windows.txt
+wmi==1.5.1 ; sys_platform == "win32"
-    #   requests
+    # via -r requirements/base.txt
-wheel==0.38.4
-    # via -r requirements/windows.txt
-wmi==1.5.1
-    # via -r requirements/windows.txt
 zc.lockfile==3.0.post1
     # via cherrypy
-zipp==3.15.0
+zipp==3.16.2
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/static/pkg/windows.in

@@ -1,2 +1,3 @@
 # This file only exists to trigger the right static compiled requirements destination
-# Don't add any requirements here, add them in requirements/windows.txt
+# Don't add any requirements here, add them in requirements/base.txt
+# If they are windows specific, place "; sys_platform == 'win32'" in front of the requirement.

requirements/windows.txt

@@ -1,31 +1,5 @@
 # Windows source distribution requirements
+# Don't add any requirements here, add them in requirements/base.txt
+# If they are windows specific, place "; sys_platform == 'win32'" in front of the requirement.
 
 -r zeromq.txt
-
-pywin32>=305
-wmi>=1.5.1
-pythonnet>=3.0.1
-
-certifi>=2022.12.07
-cffi>=1.14.5
-cherrypy>=18.6.1
-gitpython>=3.1.37
-cryptography>=41.0.3
-lxml>=4.6.3
-pyasn1>=0.4.8
-pymssql>=2.2.1
-pymysql>=1.0.2
-pyopenssl>=23.2.0
-python-dateutil>=2.8.1
-python-gnupg>=0.4.7
-requests>=2.25.1
-setproctitle>=1.2.3
-timelib>=0.2.5
-urllib3>=1.26.5
-# Watchdog pulls in a GPL-3 package, argh, which cannot be shipped on the
-# windows distribution package.
-#
-# watchdog>=2.1.3
-wheel>=0.38.1
-
-importlib-metadata>=3.3.0