Merge pull request #193 from jacobtruman/XENG-8985

Update requirements to fix issue with upload to pypi repos

Author: jacobtruman

Dockerfile

@@ -48,7 +48,7 @@ COPY . /buildrunner-source
 RUN                                                              \
     cd /buildrunner-source &&                                    \
     sed -i s/jaraco-classes/jaraco.classes/ requirements.txt &&  \
-    python3 setup.py install &&                                  \
+    pip install . && \
     rm -rf /buildrunner-source
 
 # The following will install docker-engine. It's not needed for the container to run,

bin/buildrunner

@@ -9,4 +9,4 @@ from buildrunner import cli
 
 
 if __name__ == "__main__":
-    sys.exit(cli.main(sys.argv))
+    sys.exit(cli.main())

bin/buildrunner-cleanup

@@ -9,4 +9,4 @@ from buildrunner import cli
 
 
 if __name__ == "__main__":
-    sys.exit(cli.clean_cache(sys.argv))
+    sys.exit(cli.clean_cache())

buildrunner/cli.py

@@ -270,9 +270,9 @@ def parse_args(argv):
     return args
 
 
-def clean_cache(argv):
+def clean_cache():
     """Cache cleanup"""
-    args = parse_args(argv)
+    args = parse_args(sys.argv)
     BuildRunnerConfig.initialize_instance(
         push=False,
         build_number=1,
@@ -409,9 +409,9 @@ def initialize_br(args: argparse.Namespace) -> BuildRunner:
     )
 
 
-def main(argv):
+def main():
     """Main program execution."""
-    args = parse_args(argv)
+    args = parse_args(sys.argv)
 
     # are we just printing the version?
     if args.print_version:
@@ -431,4 +431,4 @@ def main(argv):
 
 
 if __name__ == "__main__":
-    sys.exit(main(sys.argv))
+    sys.exit(main())

buildrunner/docker/runner.py

@@ -23,7 +23,6 @@
 from docker.utils import compare_version
 from retry import retry
 import docker.errors
-import six
 import timeout_decorator
 
 from buildrunner import BuildRunnerConfig
@@ -217,7 +216,7 @@ def start(
             _port_list = list(ports.keys())
 
         # check args
-        if dns_search and isinstance(dns_search, six.string_types):
+        if dns_search and isinstance(dns_search, str):
             dns_search = dns_search.split(",")
 
         kwargs = {

pyproject.toml

@@ -0,0 +1,36 @@
+[build-system]
+requires = ["setuptools>=42", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "buildrunner"
+version = "3.15"
+description = "Docker-based build tool"
+readme = "README.rst"
+requires-python = ">=3.6"
+license = {text = "MIT"}
+authors = [
+    {name = "Adobe", email = "[email protected]"}
+]
+urls = { "Homepage" = "https://github.com/adobe/buildrunner" }
+
+dynamic = ["dependencies", "optional-dependencies"]
+
+[tool.setuptools.dynamic]
+dependencies = {file = ["requirements.txt"]}
+optional-dependencies = {test = { file = ["test-requirements.txt"] }}
+
+[project.scripts]
+buildrunner = "buildrunner.cli:main"
+buildrunner-cleanup = "buildrunner.cli:clean_cache"
+
+[tool.setuptools.package-data]
+"buildrunner" = ["SourceDockerfile"]
+"buildrunner.sshagent" = [
+    "SSHAgentProxyImage/Dockerfile",
+    "SSHAgentProxyImage/run.sh",
+    "SSHAgentProxyImage/login.sh"
+]
+
+[tool.setuptools.packages.find]
+exclude = ["*.tests", "*.tests.*", "tests.*", "tests"]

requirements.in

@@ -6,12 +6,12 @@ docker>=6.1.2
 fabric>=2.5.0
 paramiko>=2.10.3
 requests>=2.27.0
-twine>=3.2.0
+twine>=6.1.0
 vcsinfo>=2.1.105
 graphlib-backport>=1.0.3
 timeout-decorator>=0.5.0
 python-on-whales>=0.70.1
-pydantic>=2.4.2
+pydantic==2.4.2
 retry2>=0.9.5
 colorlog>=6.8.0
 rich>=13

requirements.txt

@@ -1,107 +1,118 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
 #    pip-compile
 #
-annotated-types==0.6.0
+
+annotated-types==0.7.0
     # via pydantic
-bcrypt==4.0.1
+backports-tarfile==1.2.0
+    # via jaraco-context
+bcrypt==4.3.0
     # via
     #   -r requirements.in
     #   paramiko
-bleach==6.0.0
-    # via readme-renderer
-certifi==2023.5.7
+certifi==2025.1.31
     # via requests
-cffi==1.15.1
+cffi==1.17.1
     # via
     #   cryptography
     #   pynacl
-charset-normalizer==3.1.0
+charset-normalizer==3.4.1
     # via requests
-click==8.1.6
-    # via typer
-colorlog==6.8.0
+colorlog==6.9.0
     # via -r requirements.in
-cryptography==41.0.1
+cryptography==44.0.2
     # via paramiko
-decorator==5.1.1
+decorator==5.2.1
     # via
     #   -r requirements.in
     #   fabric
     #   retry2
-docker==6.1.3
+deprecated==1.2.18
+    # via fabric
+docker==7.1.0
     # via -r requirements.in
 docutils==0.20.1
     # via readme-renderer
-fabric==3.1.0
+fabric==3.2.2
     # via -r requirements.in
-gitdb==4.0.10
+gitdb==4.0.12
     # via
     #   gitpython
     #   vcsinfo
-gitpython==3.1.31
+gitpython==3.1.44
     # via vcsinfo
-graphlib-backport==1.0.3
+graphlib-backport==1.1.0
     # via -r requirements.in
-idna==3.4
+id==1.5.0
+    # via twine
+idna==3.10
     # via requests
-importlib-metadata==6.6.0
+importlib-metadata==8.5.0
     # via
     #   keyring
     #   twine
-invoke==2.1.2
+importlib-resources==6.4.5
+    # via keyring
+invoke==2.2.0
     # via fabric
-jaraco-classes==3.2.3
+jaraco-classes==3.4.0
     # via keyring
-jinja2==3.1.2
+jaraco-context==6.0.1
+    # via keyring
+jaraco-functools==4.1.0
+    # via keyring
+jinja2==3.1.6
     # via -r requirements.in
-keyring==23.13.1
+keyring==25.5.0
     # via twine
-markdown-it-py==2.2.0
+markdown-it-py==3.0.0
     # via rich
-markupsafe==2.1.3
+markupsafe==2.1.5
     # via jinja2
 mdurl==0.1.2
     # via markdown-it-py
-more-itertools==9.1.0
-    # via jaraco-classes
-packaging==23.1
-    # via docker
-paramiko==3.2.0
+more-itertools==10.5.0
+    # via
+    #   jaraco-classes
+    #   jaraco-functools
+nh3==0.2.21
+    # via readme-renderer
+packaging==24.2
+    # via twine
+paramiko==3.5.1
     # via
     #   -r requirements.in
     #   fabric
-pkginfo==1.9.6
-    # via twine
-portalocker==2.10.1
+portalocker==3.0.0
     # via -r requirements.in
-pycparser==2.21
+pycparser==2.22
     # via cffi
 pydantic==2.4.2
     # via
     #   -r requirements.in
     #   python-on-whales
 pydantic-core==2.10.1
     # via pydantic
-pygments==2.15.1
+pygments==2.19.1
     # via
     #   readme-renderer
     #   rich
 pynacl==1.5.0
     # via paramiko
-python-on-whales==0.70.1
+python-on-whales==0.75.1
     # via -r requirements.in
-pyyaml==6.0.1
+pyyaml==6.0.2
     # via -r requirements.in
-readme-renderer==37.3
+readme-renderer==43.0
     # via twine
-requests==2.31.0
+requests==2.32.3
     # via
     #   -r requirements.in
     #   docker
-    #   python-on-whales
+    #   id
     #   requests-toolbelt
     #   twine
 requests-toolbelt==1.0.0
@@ -110,38 +121,33 @@ retry2==0.9.5
     # via -r requirements.in
 rfc3986==2.0.0
     # via twine
-rich==13.7.0
+rich==13.9.4
     # via
     #   -r requirements.in
     #   twine
-six==1.16.0
-    # via bleach
-smmap==5.0.0
+smmap==5.0.2
     # via gitdb
 timeout-decorator==0.5.0
     # via -r requirements.in
-tqdm==4.65.0
-    # via python-on-whales
-twine==4.0.2
+twine==6.1.0
     # via -r requirements.in
-typer==0.9.0
-    # via python-on-whales
-typing-extensions==4.7.1
+typing-extensions==4.13.0
     # via
+    #   annotated-types
     #   pydantic
     #   pydantic-core
     #   python-on-whales
-    #   typer
-urllib3==2.0.3
+    #   rich
+urllib3==2.2.3
     # via
     #   docker
     #   requests
     #   twine
-vcsinfo==2.1.105
+vcsinfo==2.1.110
     # via -r requirements.in
-webencodings==0.5.1
-    # via bleach
-websocket-client==1.5.2
-    # via docker
-zipp==3.15.0
-    # via importlib-metadata
+wrapt==1.17.2
+    # via deprecated
+zipp==3.20.2
+    # via
+    #   importlib-metadata
+    #   importlib-resources