diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0018c400..38a7640d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -17,7 +17,6 @@ jobs: fail-fast: false matrix: python-version: - - 3.8 - 3.9 - '3.10' - '3.11' @@ -59,7 +58,9 @@ jobs: # Fetch all history instead of the latest commit fetch-depth: 0 - name: Get and set version in env - run: echo "CURRENT_VERSION=$( python setup.py --version )" >> $GITHUB_ENV + run: | + python scripts/write-version.py + echo "CURRENT_VERSION=$( python -c 'from buildrunner.version import __version__; print(__version__)' )" >> $GITHUB_ENV - name: Print current version run: echo CURRENT_VERSION ${{ env.CURRENT_VERSION }} - name: Tag commit @@ -76,10 +77,12 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.9 - name: Remove version file # This is just in case something else created it, destroy it to get a fresh version run: rm -f buildrunner/version.py + - name: Write version file + run: python scripts/write-version.py - name: Install wheel run: pip install wheel build - name: Build @@ -103,7 +106,9 @@ jobs: # Fetch all history instead of the latest commit fetch-depth: 0 - name: Get and set version in env - run: echo "CURRENT_VERSION=$( python setup.py --version )" >> $GITHUB_ENV + run: | + python scripts/write-version.py + echo "CURRENT_VERSION=$( python -c 'from buildrunner.version import __version__; print(__version__)' )" >> $GITHUB_ENV - name: Print current version run: echo CURRENT_VERSION ${{ env.CURRENT_VERSION }} - name: Docker Tags diff --git a/BASE_VERSION b/BASE_VERSION index 230693c3..1bc446c8 100644 --- a/BASE_VERSION +++ b/BASE_VERSION @@ -1 +1 @@ -3.15 \ No newline at end of file +3.16 \ No newline at end of file diff --git a/bin/buildrunner-cleanup b/bin/buildrunner-cleanup deleted file mode 100755 index cc460805..00000000 --- a/bin/buildrunner-cleanup +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env python3 -""" -Copyright (C) 2020 Adobe -""" - -import sys - -from buildrunner import cli - - -if __name__ == "__main__": - sys.exit(cli.clean_cache()) diff --git a/pyproject.toml b/pyproject.toml index e6b9da25..2fc29114 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,4 +32,4 @@ buildrunner-cleanup = "buildrunner.cli:clean_cache" ] [tool.setuptools.packages.find] -exclude = ["*.tests", "*.tests.*", "tests.*", "tests"] +exclude = ["*.tests", "*.tests.*", "tests.*", "tests"] \ No newline at end of file diff --git a/pytest.ini b/pytest.ini index b4713768..8a56c4cc 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,4 +1,5 @@ [pytest] addopts = --strict-markers markers = - serial \ No newline at end of file + serial +retries = 2 diff --git a/requirements.txt b/requirements.txt index 72455b66..5cce0d6a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile @@ -34,7 +34,7 @@ deprecated==1.2.18 # via fabric docker==7.1.0 # via -r requirements.in -docutils==0.20.1 +docutils==0.21.2 # via readme-renderer fabric==3.2.2 # via -r requirements.in @@ -50,11 +50,7 @@ id==1.5.0 # via twine idna==3.10 # via requests -importlib-metadata==8.5.0 - # via - # keyring - # twine -importlib-resources==6.4.5 +importlib-metadata==8.6.1 # via keyring invoke==2.2.0 # via fabric @@ -66,15 +62,15 @@ jaraco-functools==4.1.0 # via keyring jinja2==3.1.6 # via -r requirements.in -keyring==25.5.0 +keyring==25.6.0 # via twine markdown-it-py==3.0.0 # via rich -markupsafe==2.1.5 +markupsafe==3.0.2 # via jinja2 mdurl==0.1.2 # via markdown-it-py -more-itertools==10.5.0 +more-itertools==10.6.0 # via # jaraco-classes # jaraco-functools @@ -86,7 +82,7 @@ paramiko==3.5.1 # via # -r requirements.in # fabric -portalocker==3.0.0 +portalocker==3.1.1 # via -r requirements.in pycparser==2.22 # via cffi @@ -102,11 +98,11 @@ pygments==2.19.1 # rich pynacl==1.5.0 # via paramiko -python-on-whales==0.75.1 +python-on-whales==0.76.1 # via -r requirements.in pyyaml==6.0.2 # via -r requirements.in -readme-renderer==43.0 +readme-renderer==44.0 # via twine requests==2.32.3 # via @@ -133,12 +129,10 @@ twine==6.1.0 # via -r requirements.in typing-extensions==4.13.0 # via - # annotated-types # pydantic # pydantic-core # python-on-whales - # rich -urllib3==2.2.3 +urllib3==2.3.0 # via # docker # requests @@ -147,7 +141,5 @@ vcsinfo==2.1.110 # via -r requirements.in wrapt==1.17.2 # via deprecated -zipp==3.20.2 - # via - # importlib-metadata - # importlib-resources +zipp==3.21.0 + # via importlib-metadata diff --git a/test_requirements.in b/test_requirements.in index 1c6e8235..db8bb891 100644 --- a/test_requirements.in +++ b/test_requirements.in @@ -1,5 +1,6 @@ pytest>=7.2.1 pytest-randomly>=3.5.0 +pytest-retry>=1.7.0 pytest-cov>=2.10.1 pytest-xdist>=2.4.0 graphlib-backport>=1.0.3 diff --git a/test_requirements.txt b/test_requirements.txt index 6d5a0f49..5ede106f 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -2,8 +2,9 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile test_requirements.in +# pip-compile --output-file=test_requirements.txt test_requirements.in # + attrs==23.1.0 # via # cattrs @@ -51,6 +52,7 @@ pytest==7.3.1 # pytest-cov # pytest-randomly # pytest-rerunfailures + # pytest-retry # pytest-xdist pytest-cov==4.1.0 # via -r test_requirements.in @@ -58,6 +60,8 @@ pytest-randomly==3.12.0 # via -r test_requirements.in pytest-rerunfailures==14.0 # via -r test_requirements.in +pytest-retry==1.7.0 + # via -r test_requirements.in pytest-xdist==3.3.1 # via -r test_requirements.in pyyaml==6.0.1