Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: AcademySoftwareFoundation/rez
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.113.0
Choose a base ref
...
head repository: AcademySoftwareFoundation/rez
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.114.0
Choose a head ref

Commits on Sep 15, 2023

  1. Fix benchmarks (#1531)

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso authored Sep 15, 2023
    Copy the full SHA
    3320a9e View commit details

Commits on Oct 1, 2023

  1. Meeting notes for 2023-08-17 TSC meeting

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso committed Oct 1, 2023
    Copy the full SHA
    ab317e6 View commit details

Commits on Oct 22, 2023

  1. Add presentation from Dreamworks Animation

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso committed Oct 22, 2023
    Copy the full SHA
    73e7493 View commit details

Commits on Oct 26, 2023

  1. Add wiki paragraph describing supported Rez config file formats (#1556)

    Signed-off-by: brycegbrazen <bryce.gattis@brazenanimation.com>
    brycegbrazen authored Oct 26, 2023
    Copy the full SHA
    cfc333e View commit details

Commits on Oct 27, 2023

  1. Add ability to run the benchmark workflow from PRs (#1555)

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso authored Oct 27, 2023
    Copy the full SHA
    371644d View commit details

Commits on Nov 10, 2023

  1. Replace deprecated stdlib calls (#1572)

    * Replace pipes import with shlex for Python 3
    * Replace imports of cgi with html for Python 3
    
    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso authored Nov 10, 2023
    Copy the full SHA
    0137866 View commit details
  2. Change rez.__license__ to Apache-2.0 and add back Allan as author, bu…

    …t mark the package as maintained by TSC. (#1571)
    
    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso authored Nov 10, 2023
    Copy the full SHA
    1deb44a View commit details
  3. Document _REZ_NO_KILLPG, _REZ_QUIET_ON_SIG and REZ_LOGGING_CONF (#1570)

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso authored Nov 10, 2023
    Copy the full SHA
    5ac6b89 View commit details
  4. Configure dependabot for GHA and docs (#1575)

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso authored Nov 10, 2023
    Copy the full SHA
    d5d7cec View commit details
  5. Bump actions/checkout from 2 to 4 (#1576)

    Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4.
    - [Release notes](https://github.com/actions/checkout/releases)
    - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
    - [Commits](actions/checkout@v2...v4)
    
    ---
    updated-dependencies:
    - dependency-name: actions/checkout
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Nov 10, 2023
    Copy the full SHA
    7212a40 View commit details

Commits on Nov 11, 2023

  1. Drop support for installs with Python lower than 3.7 and remove embed…

    …ded virtualenv (#1469)
    
    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso authored Nov 11, 2023
    Copy the full SHA
    345531e View commit details
  2. Remove wiki sources (#1560)

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso authored Nov 11, 2023
    Copy the full SHA
    2db9073 View commit details
  3. Add back patch to fix memcached stats reset. See #1563. (#1577)

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso authored Nov 11, 2023
    Copy the full SHA
    6583395 View commit details
  4. update readme and wiki footer with new slack, rtd, email list, licens…

    …e badges (#1538)
    
    Signed-off-by: Stephen Mackenzie <maxnbk@users.noreply.github.com>
    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    Co-authored-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    maxnbk and JeanChristopheMorinPerso authored Nov 11, 2023
    Copy the full SHA
    c3e5130 View commit details
  5. Fix typo in slack URL

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso committed Nov 11, 2023
    Copy the full SHA
    f211fe6 View commit details
  6. Include composite actions in dependabot config

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso committed Nov 11, 2023
    Copy the full SHA
    619fe43 View commit details
  7. Bump actions/checkout from 2 to 4 (#1579)

    Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4.
    - [Release notes](https://github.com/actions/checkout/releases)
    - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
    - [Commits](actions/checkout@v2...v4)
    
    ---
    updated-dependencies:
    - dependency-name: actions/checkout
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Nov 11, 2023
    Copy the full SHA
    2c7d996 View commit details

Commits on Nov 12, 2023

  1. Fix sphinx warnings and show inheritance in API docs (#1580)

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso authored Nov 12, 2023
    Copy the full SHA
    a5977da View commit details
  2. Update type hint for the package_filter argument of ResolvedContext's…

    … constructor (#1582)
    
    Signed-off-by: brycegbrazen <bryce.gattis@brazenanimation.com>
    brycegbrazen authored Nov 12, 2023
    Copy the full SHA
    762a6c6 View commit details

Commits on Nov 17, 2023

  1. Continue on missing variant packages (#1550)

    Add support for `error_on_missing_variant_packages` which treats a missing package in a variant as a failed variant rather than an immediate error
    
    ---------
    
    Signed-off-by: Dhruv Govil <dgovil2@apple.com>
    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    dgovil authored Nov 17, 2023
    Copy the full SHA
    0e7ceb0 View commit details

Commits on Nov 18, 2023

  1. Run benchmarks on Python 3.7 only since we can't install rez with 2.7…

    … anymore (#1590)
    
    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso authored Nov 18, 2023
    Copy the full SHA
    61080af View commit details
  2. Publish release notice to ASWF slack on releases (#1583)

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso authored Nov 18, 2023
    Copy the full SHA
    6ddcb97 View commit details
  3. Publish to PyPI using https://docs.pypi.org/trusted-publishers/ (#1591)

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso authored Nov 18, 2023
    Copy the full SHA
    e9adf0c View commit details

Commits on Nov 24, 2023

  1. Properly mark things that are deprecated as deprecated (#1562)

    Properly mark things that are deprecated as deprecated and add a new environment variable called REZ_LOG_DEPRECATION_WARNINGS to help users know when they are using deprecated things.
    
    ---------
    
    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso authored Nov 24, 2023
    Copy the full SHA
    eca3861 View commit details
  2. Rename rez.vendor.version to rez.version and define a public API for …

    …rez.version (#1534)
    
    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso authored Nov 24, 2023
    Copy the full SHA
    c6a200c View commit details
  3. Bump version to 2.114.0

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso committed Nov 24, 2023
    Copy the full SHA
    2402577 View commit details
  4. Add date to changelog

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso committed Nov 24, 2023
    Copy the full SHA
    b178aa3 View commit details
  5. Add missing changelog entry

    Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
    JeanChristopheMorinPerso committed Nov 24, 2023
    Copy the full SHA
    86dc375 View commit details
Showing with 4,361 additions and 10,389 deletions.
  1. +21 −0 .github/dependabot.yml
  2. +2 −1 .github/scripts/store_benchmark.py
  3. +30 −30 .github/workflows/benchmark.yaml
  4. +1 −1 .github/workflows/copyright.yaml
  5. +74 −4 .github/workflows/core.yaml
  6. +1 −1 .github/workflows/flake8.yaml
  7. +5 −1 .github/workflows/installation.yaml
  8. +1 −2 .github/workflows/mac.yaml
  9. +13 −8 .github/workflows/pypi.yaml
  10. +20 −0 .github/workflows/release-notice.yaml
  11. +1 −2 .github/workflows/ubuntu.yaml
  12. +0 −63 .github/workflows/wiki.yaml
  13. +4 −5 .github/workflows/windows.yaml
  14. +1 −1 ASWF/TSC/meeting-notes/{2023-07-20.md → 2023-07-20/notes.md}
  15. BIN ASWF/TSC/meeting-notes/2023-07-20/presentation.pdf
  16. +91 −0 ASWF/TSC/meeting-notes/2023-08-17/notes.md
  17. BIN ASWF/TSC/meeting-notes/2023-08-17/presentation.pdf
  18. +114 −28 CHANGELOG.md
  19. +1 −1 CODEOWNERS
  20. +2 −2 CONTRIBUTING.md
  21. +1 −82 INSTALL.md
  22. +15 −11 README.md
  23. +0 −15 docs/NOTES.md
  24. +31 −0 docs/README.md
  25. +2 −1 docs/requirements.txt
  26. +1 −1 docs/source/api.rst
  27. +5 −0 docs/source/changelog.md
  28. +61 −1 docs/source/conf.py
  29. +8 −0 docs/source/configuring_rez.rst
  30. +35 −3 docs/source/environment.rst
  31. +182 −0 docs/source/getting_started.rst
  32. +10 −0 docs/source/guides/index.rst
  33. +85 −0 docs/source/guides/prepare_for_3.rst
  34. +3 −0 docs/source/index.rst
  35. +8 −0 docs/source/installation.rst
  36. +2 −2 docs/source/package_commands.rst
  37. +1 −1 docs/source/package_definition.rst
  38. +18 −26 install.py
  39. +3 −0 pyproject.toml
  40. +1 −1 release-rez.py
  41. +5 −3 setup.py
  42. +0 −4 src/build_utils/README.md
  43. +0 −1 src/build_utils/license/apply_copyright
  44. +0 −22 src/build_utils/virtualenv/LICENSE.txt
  45. +0 −4 src/build_utils/virtualenv/README.md
  46. 0 src/build_utils/virtualenv/__init__.py
  47. +0 −2,611 src/build_utils/virtualenv/virtualenv.py
  48. 0 src/build_utils/virtualenv/virtualenv_support/__init__.py
  49. BIN src/build_utils/virtualenv/virtualenv_support/pip-19.1.1-py2.py3-none-any.whl
  50. BIN src/build_utils/virtualenv/virtualenv_support/setuptools-41.0.1-py2.py3-none-any.whl
  51. BIN src/build_utils/virtualenv/virtualenv_support/wheel-0.33.4-py2.py3-none-any.whl
  52. +19 −1 src/rez/__init__.py
  53. +2 −2 src/rez/bind/_utils.py
  54. +1 −1 src/rez/bind/arch.py
  55. +1 −1 src/rez/bind/hello_world.py
  56. +1 −1 src/rez/bind/os.py
  57. +1 −1 src/rez/bind/platform.py
  58. +1 −1 src/rez/bind/rezgui.py
  59. +10 −4 src/rez/build_process.py
  60. +3 −3 src/rez/build_process_.py
  61. +13 −10 src/rez/build_system.py
  62. +3 −1 src/rez/bundle_context.py
  63. +1 −1 src/rez/cli/_entry_points.py
  64. +1 −1 src/rez/cli/mv.py
  65. +6 −9 src/rez/cli/pip.py
  66. +1 −1 src/rez/cli/pkg-ignore.py
  67. +2 −2 src/rez/cli/rm.py
  68. +7 −0 src/rez/cli/search.py
  69. +3 −0 src/rez/cli/selftest.py
  70. +82 −0 src/rez/config.py
  71. +10 −0 src/rez/data/tests/solver/packages/missing_variant_requires/1/package.py
  72. +35 −0 src/rez/deprecations.py
  73. +4 −3 src/rez/package_cache.py
  74. +21 −19 src/rez/package_copy.py
  75. +71 −33 src/rez/package_filter.py
  76. +3 −3 src/rez/package_maker.py
  77. +3 −3 src/rez/package_maker__.py
  78. +80 −55 src/rez/package_order.py
  79. +27 −20 src/rez/package_py_utils.py
  80. +2 −2 src/rez/package_remove.py
  81. +1 −1 src/rez/package_repository.py
  82. +2 −6 src/rez/package_resources.py
  83. +3 −3 src/rez/package_resources_.py
  84. +8 −5 src/rez/package_search.py
  85. +2 −2 src/rez/package_serialise.py
  86. +27 −25 src/rez/package_test.py
  87. +9 −9 src/rez/packages.py
  88. +3 −3 src/rez/packages_.py
  89. +2 −2 src/rez/pip.py
  90. +1 −1 src/rez/plugin_managers.py
  91. +2 −2 src/rez/release_vcs.py
  92. +91 −69 src/rez/resolved_context.py
  93. +1 −1 src/rez/resolver.py
  94. +8 −1 src/rez/rex.py
  95. +30 −21 src/rez/rex_bindings.py
  96. +55 −5 src/rez/rezconfig.py
  97. +15 −14 src/rez/serialise.py
  98. +14 −10 src/rez/shells.py
  99. +16 −7 src/rez/solver.py
  100. +5 −2 src/rez/suite.py
  101. +1 −1 src/rez/tests/test_commands.py
  102. +1 −1 src/rez/tests/test_completion.py
  103. +1 −1 src/rez/tests/test_copy_package.py
  104. +1 −1 src/rez/tests/test_package_filter.py
  105. +4 −3 src/rez/tests/test_packages.py
  106. +1 −1 src/rez/tests/test_packages_order.py
  107. +2 −2 src/rez/tests/test_pip_utils.py
  108. +2 −2 src/rez/tests/test_rex.py
  109. +11 −1 src/rez/tests/test_solver.py
  110. +495 −3 src/rez/tests/test_version.py
  111. +1 −1 src/rez/tests/util.py
  112. +2 −1 src/rez/utils/_version.py
  113. +6 −5 src/rez/utils/colorize.py
  114. +6 −3 src/rez/utils/data_utils.py
  115. +2 −2 src/rez/utils/elf.py
  116. +1 −1 src/rez/utils/execution.py
  117. +29 −29 src/rez/utils/filesystem.py
  118. +1 −1 src/rez/utils/formatting.py
  119. +1 −1 src/rez/utils/logging_.py
  120. +6 −4 src/rez/utils/memcached.py
  121. +1 −1 src/rez/utils/patching.py
  122. +40 −36 src/rez/utils/pip.py
  123. +12 −10 src/rez/utils/platform_mapped.py
  124. +12 −0 src/rez/utils/py23.py
  125. +1 −0 src/rez/utils/py_dist.py
  126. +5 −7 src/rez/utils/resources.py
  127. +7 −5 src/rez/utils/schema.py
  128. +2 −2 src/rez/utils/yaml.py
  129. +1 −1 src/rez/vendor/README.md
  130. +2 −1 src/rez/vendor/memcache/memcache.py
  131. +9 −0 src/rez/vendor/version/__init__.py
  132. +1 −413 src/rez/vendor/version/requirement.py
  133. +0 −505 src/rez/vendor/version/test.py
  134. +1 −26 src/rez/vendor/version/util.py
  135. +1 −1,488 src/rez/vendor/version/version.py
  136. +50 −0 src/rez/version/__init__.py
  137. +476 −0 src/rez/version/_requirement.py
  138. +30 −0 src/rez/version/_util.py
  139. +1,541 −0 src/rez/version/_version.py
  140. +1 −1 src/rezgui/dialogs/AboutDialog.py
  141. +1 −1 src/rezgui/dialogs/ResolveDialog.py
  142. +1 −1 src/rezgui/widgets/BrowsePackageWidget.py
  143. +2 −3 src/rezgui/widgets/ChangelogEdit.py
  144. +2 −2 src/rezgui/widgets/ContextTableWidget.py
  145. +1 −1 src/rezgui/widgets/PackageLineEdit.py
  146. +2 −2 src/rezgui/widgets/VariantCellWidget.py
  147. +1 −1 src/rezgui/widgets/VariantHelpWidget.py
  148. +1 −1 src/rezgui/widgets/VariantVersionsTable.py
  149. +1 −1 src/rezgui/widgets/VariantVersionsWidget.py
  150. +1 −1 src/rezplugins/build_system/custom.py
  151. +6 −1 src/rezplugins/package_repository/filesystem.py
  152. +1 −1 src/rezplugins/package_repository/memory.py
  153. +2 −2 src/rezplugins/shell/csh.py
  154. +2 −2 src/rezplugins/shell/sh.py
  155. +2 −2 src/rezplugins/shell/tcsh.py
  156. +0 −16 wiki/README.md
  157. +0 −435 wiki/generate-wiki.py
  158. BIN wiki/media/icons/info.png
  159. BIN wiki/media/icons/new.png
  160. BIN wiki/media/icons/under_construction.png
  161. BIN wiki/media/icons/warning.png
  162. BIN wiki/media/other_pkg_mgr.png
  163. BIN wiki/media/pkg_path_anatomy.png
  164. BIN wiki/media/rez_banner_128.png
  165. BIN wiki/media/rez_deps_simple_eg.png
  166. BIN wiki/media/rez_env.png
  167. BIN wiki/media/rez_pkg_mgr.png
  168. +0 −369 wiki/pages/Basic-Concepts.md
  169. +0 −255 wiki/pages/Building-Packages.md
  170. +0 −81 wiki/pages/Bundles.md
  171. +0 −1 wiki/pages/Command-Line-Tools.md
  172. +0 −118 wiki/pages/Configuring-Rez.md
  173. +0 −97 wiki/pages/Contexts.md
  174. +0 −15 wiki/pages/Credits.md
  175. +0 −102 wiki/pages/Environment-Variables.md
  176. +0 −156 wiki/pages/Ephemeral-Packages.md
  177. +0 −1 wiki/pages/FAQ.md
  178. +0 −158 wiki/pages/Getting-Started.md
  179. +0 −50 wiki/pages/Glossary.md
  180. +0 −105 wiki/pages/Home.md
  181. +0 −82 wiki/pages/Installation.md
  182. +0 −360 wiki/pages/Managing-Packages.md
  183. +0 −4 wiki/pages/Notes.md
  184. +0 −612 wiki/pages/Package-Commands.md
  185. +0 −925 wiki/pages/Package-Definition-Guide.md
  186. +0 −132 wiki/pages/Pip.md
  187. +0 −150 wiki/pages/Suites.md
  188. +0 −226 wiki/pages/Variants.md
  189. +0 −4 wiki/pages/_Footer.md
  190. +0 −47 wiki/pages/_Sidebar.md
21 changes: 21 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Set update schedule for GitHub Actions
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"

# https://github.com/dependabot/dependabot-core/issues/6704
- package-ecosystem: "github-actions"
directory: "/.github/actions/setup-python"
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"

- package-ecosystem: "pip"
directory: "/docs"
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"
3 changes: 2 additions & 1 deletion .github/scripts/store_benchmark.py
Original file line number Diff line number Diff line change
@@ -59,7 +59,8 @@ def store_result():
destdir = '-'.join((
time.strftime("%Y.%m.%d"),
"%d.%d" % sys.version_info[:2],
_rez_version
# TODO: We could read the version from summary.json...
_rez_version,
))

destpath = os.path.join(artifacts_dir, destdir)
60 changes: 30 additions & 30 deletions .github/workflows/benchmark.yaml
Original file line number Diff line number Diff line change
@@ -5,27 +5,24 @@ name: benchmark
on:
release:
types: [released]
pull_request:
types: [opened, synchronize, reopened, labeled]

jobs:
run_benchmark:
name: run_benchmark
runs-on: ubuntu-latest

if: ${{ github.event_name == 'release' || contains(github.event.pull_request.labels.*.name, 'run-benchmarks') }}

strategy:
matrix:
python-version:
- '2.7'
- '3.7'

# without this, we're sometimes getting at the end of this job:
# '[error] The operation was canceled'.
# Do we hit a resource limit?
#
max-parallel: 1

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup python ${{ matrix.python-version }}
uses: ./.github/actions/setup-python
@@ -37,11 +34,6 @@ jobs:
run: |
mkdir ./installdir
if [[ "${{ matrix.python-version }}" == "2.7" ]]; then
eval "$(conda shell.bash hook)"
conda activate python
fi
python ./install.py ./installdir
- name: Run Benchmark
@@ -53,10 +45,6 @@ jobs:
- name: Validate Result
run: |
if [[ "${{ matrix.python-version }}" == "2.7" ]]; then
eval "$(conda shell.bash hook)"
conda activate python
fi
python ./.github/scripts/validate_benchmark.py
- uses: actions/upload-artifact@v3
@@ -72,26 +60,20 @@ jobs:
strategy:
matrix:
python-version:
- '2.7'
- '3.7'

# so we don't have jobs trying to push to git at the same time
max-parallel: 1

steps:
- name: Setup python ${{ matrix.python-version }}
uses: ./.github/actions/setup-python
with:
python-version: ${{ matrix.python-version }}
os: ubuntu

- uses: actions/download-artifact@v3
with:
name: "benchmark-result-${{ matrix.python-version }}"
path: .

- name: Checkout
uses: actions/checkout@v3
- name: Checkout (release)
uses: actions/checkout@v4
if: ${{ github.event_name =='release' }}
with:
ref: main
path: src
@@ -102,6 +84,18 @@ jobs:
#
token: "${{ secrets.GH_ACTION_TOKEN }}"

- name: Checkout (pr)
uses: actions/checkout@v4
if: ${{ github.event_name !='release' }}
with:
path: src

- name: Setup python ${{ matrix.python-version }}
uses: ./src/.github/actions/setup-python
with:
python-version: ${{ matrix.python-version }}
os: ubuntu-latest

# Note failing due to
# https://github.com/actions/virtual-environments/issues/675
#
@@ -114,20 +108,26 @@ jobs:
- name: Store Benchmark Result
run: |
if [[ "${{ matrix.python-version }}" == "2.7" ]]; then
eval "$(conda shell.bash hook)"
conda activate python
fi
python ./.github/scripts/store_benchmark.py
working-directory: src

- name: Create summary
run: |
echo '<details>' >> $GITHUB_STEP_SUMMARY
echo '<summary>Results</summary>' >> $GITHUB_STEP_SUMMARY
cat metrics/benchmarking/RESULTS.md >> $GITHUB_STEP_SUMMARY
echo '</details>' >> $GITHUB_STEP_SUMMARY
working-directory: src

- name: Setup git config
if: ${{ github.event_name == 'release' }}
run: |
git config user.name 'github-actions[bot]'
git config user.email 'github-actions[bot]@users.noreply.github.com'
working-directory: src

- name: Git commit and push
if: ${{ github.event_name == 'release' }}
run: |
if [[ "$(git status --porcelain)" == "" ]]; then
echo "Nothing new to commit"
2 changes: 1 addition & 1 deletion .github/workflows/copyright.yaml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
78 changes: 74 additions & 4 deletions .github/workflows/core.yaml
Original file line number Diff line number Diff line change
@@ -24,20 +24,19 @@ concurrency:
cancel-in-progress: true

jobs:
main:
name: main
install_script:
name: install_script
runs-on: ubuntu-latest

strategy:
matrix:
python-version:
- '2.7'
- '3.7'
fail-fast: false

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup python ${{ matrix.python-version }}
uses: ./.github/actions/setup-python
@@ -82,3 +81,74 @@ jobs:
--schema \
--solver \
--version
pip:
name: pip
runs-on: ubuntu-latest

strategy:
matrix:
python-version:
- '2.7'
- '3.7'
fail-fast: false

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup python ${{ matrix.python-version }}
uses: ./.github/actions/setup-python
with:
python-version: ${{ matrix.python-version }}
os: ubuntu-latest

- name: Install Rez
run: |
set -ex
if [[ "${{ matrix.python-version }}" == "2.7" ]]; then
eval "$(conda shell.bash hook)"
conda activate python
fi
python --version
python -m pip install .
- name: Install Rez test dependencies
run: |
set -ex
if [[ "${{ matrix.python-version }}" == "2.7" ]]; then
eval "$(conda shell.bash hook)"
conda activate python
fi
python --version
python -m pip install pytest pytest-cov
# TODO: Add a --core rez-selftest option. Some test suites (eg test_context)
# have some 'core' parts (eg not reliant on a shell). It would be good to just
# run those parts when --core is present, rather than skipping the entire
# test class. This will be easier once ported to pytest.
- name: Run Rez Tests
run: |
set -ex
if [[ "${{ matrix.python-version }}" == "2.7" ]]; then
eval "$(conda shell.bash hook)"
conda activate python
fi
python --version
rez-selftest -v \
--config \
--copy_package \
--formatter \
--imports \
--packages \
--package_filter \
--packages_order \
--resources_ \
--rex \
--schema \
--solver \
--version
2 changes: 1 addition & 1 deletion .github/workflows/flake8.yaml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
6 changes: 5 additions & 1 deletion .github/workflows/installation.yaml
Original file line number Diff line number Diff line change
@@ -102,8 +102,12 @@ jobs:
}
pip install --target C:\ProgramData\rez .
exclude:
- method: install
python-version: '2.7'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup python ${{ matrix.python-version }}
uses: ./.github/actions/setup-python
3 changes: 1 addition & 2 deletions .github/workflows/mac.yaml
Original file line number Diff line number Diff line change
@@ -28,13 +28,12 @@ jobs:
os-version:
- '11'
python-version:
- '2.7'
- '3.7'
fail-fast: false

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup python ${{ matrix.python-version }}
uses: ./.github/actions/setup-python
21 changes: 13 additions & 8 deletions .github/workflows/pypi.yaml
Original file line number Diff line number Diff line change
@@ -5,28 +5,33 @@ on:

jobs:
publish:
name: Publish to PyPi
name: Publish to PyPI
runs-on: ubuntu-latest

permissions:
# IMPORTANT: this permission is mandatory for trusted publishing
id-token: write

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3
python-version: 3.11

- name: Install Dependencies
run: |
pip install wheel
pip install build
- name: Build rez
run: |
python setup.py sdist bdist_wheel
python -m build --sdist --wheel --outdir dist .
- name: Upload to PyPi
# Note that we don't need credentials.
# We rely on https://docs.pypi.org/trusted-publishers/.
- name: Upload to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: '${{ secrets.PYPI_API_TOKEN }}'
packages-dir: dist
20 changes: 20 additions & 0 deletions .github/workflows/release-notice.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Publish Release Notice to ASWF Slack

on:
release:
types:
# published should cover both 'released' and 'prereleased'
- published

permissions: {}

jobs:
publish:
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- name: Notify Slack
id: slack
with:
slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_RELEASES_URL }}
uses: fedecalendino/slack-release-notifier@v2.1.0
3 changes: 1 addition & 2 deletions .github/workflows/ubuntu.yaml
Original file line number Diff line number Diff line change
@@ -29,13 +29,12 @@ jobs:
- '20.04'
- '22.04'
python-version:
- '2.7'
- '3.7'
fail-fast: false

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup python ${{ matrix.python-version }}
uses: ./.github/actions/setup-python
Loading