-
Notifications
You must be signed in to change notification settings - Fork 14
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update versioneer
from 0.21 to 0.23
#114
Update versioneer
from 0.21 to 0.23
#114
Conversation
Click to view CI ResultsGitHub pull request #114 of commit d000560b0578ef8dcdcc1dc9c6463d5a91164d0d, no merge conflicts. Running as SYSTEM Setting status of d000560b0578ef8dcdcc1dc9c6463d5a91164d0d to PENDING with url https://10.20.13.93:8080/job/merlin_core/95/console and message: 'Pending' Using context: Jenkins Building on master in workspace /var/jenkins_home/workspace/merlin_core using credential ce87ff3c-94f0-400a-8303-cb4acb4918b5 > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/NVIDIA-Merlin/core # timeout=10 Fetching upstream changes from https://github.com/NVIDIA-Merlin/core > git --version # timeout=10 using GIT_ASKPASS to set credentials login for merlin-systems username and pass > git fetch --tags --force --progress -- https://github.com/NVIDIA-Merlin/core +refs/pull/114/*:refs/remotes/origin/pr/114/* # timeout=10 > git rev-parse d000560b0578ef8dcdcc1dc9c6463d5a91164d0d^{commit} # timeout=10 Checking out Revision d000560b0578ef8dcdcc1dc9c6463d5a91164d0d (detached) > git config core.sparsecheckout # timeout=10 > git checkout -f d000560b0578ef8dcdcc1dc9c6463d5a91164d0d # timeout=10 Commit message: "Update `versioneer` from 0.21 to 0.23" > git rev-list --no-walk 9408224520d731c51b7952a43def675b76e81756 # timeout=10 [merlin_core] $ /bin/bash /tmp/jenkins17413768858752881116.sh Looking in indexes: https://pypi.org/simple, https://pypi.ngc.nvidia.com Requirement already satisfied: dask>=2021.11.2 in /usr/local/lib/python3.8/dist-packages (from -r requirements.txt (line 1)) (2022.1.1) Requirement already satisfied: distributed>=2021.11.2 in /usr/local/lib/python3.8/dist-packages (from -r requirements.txt (line 2)) (2022.3.0) Requirement already satisfied: pandas<1.4.0dev0,>=1.2.0 in /usr/local/lib/python3.8/dist-packages (from -r requirements.txt (line 3)) (1.3.5) Requirement already satisfied: numba>=0.54 in /usr/local/lib/python3.8/dist-packages (from -r requirements.txt (line 4)) (0.55.2) Requirement already satisfied: pyarrow>=5.0.0 in /usr/local/lib/python3.8/dist-packages (from -r requirements.txt (line 5)) (6.0.0) Requirement already satisfied: protobuf>=3.0.0 in /usr/local/lib/python3.8/dist-packages (from -r requirements.txt (line 6)) (3.19.4) Requirement already satisfied: tqdm>=4.0 in /usr/local/lib/python3.8/dist-packages (from -r requirements.txt (line 7)) (4.64.0) Requirement already satisfied: tensorflow-metadata>=1.2.0 in /usr/local/lib/python3.8/dist-packages (from -r requirements.txt (line 8)) (1.9.0) Requirement already satisfied: betterproto<2.0.0 in /usr/local/lib/python3.8/dist-packages (from -r requirements.txt (line 9)) (1.2.5) Requirement already satisfied: packaging in /usr/local/lib/python3.8/dist-packages (from -r requirements.txt (line 10)) (21.3) Requirement already satisfied: cloudpickle>=1.1.1 in /usr/local/lib/python3.8/dist-packages (from dask>=2021.11.2->-r requirements.txt (line 1)) (2.1.0) Requirement already satisfied: fsspec>=0.6.0 in /usr/local/lib/python3.8/dist-packages (from dask>=2021.11.2->-r requirements.txt (line 1)) (2022.7.1) Requirement already satisfied: partd>=0.3.10 in /usr/local/lib/python3.8/dist-packages (from dask>=2021.11.2->-r requirements.txt (line 1)) (1.2.0) Requirement already satisfied: pyyaml>=5.3.1 in /usr/local/lib/python3.8/dist-packages (from dask>=2021.11.2->-r requirements.txt (line 1)) (5.4.1) Requirement already satisfied: toolz>=0.8.2 in /usr/local/lib/python3.8/dist-packages (from dask>=2021.11.2->-r requirements.txt (line 1)) (0.11.2) Requirement already satisfied: click>=6.6 in /usr/local/lib/python3.8/dist-packages (from distributed>=2021.11.2->-r requirements.txt (line 2)) (8.0.4) Requirement already satisfied: jinja2 in /usr/local/lib/python3.8/dist-packages (from distributed>=2021.11.2->-r requirements.txt (line 2)) (3.0.3) Requirement already satisfied: msgpack>=0.6.0 in /usr/local/lib/python3.8/dist-packages (from distributed>=2021.11.2->-r requirements.txt (line 2)) (1.0.4) Requirement already satisfied: psutil>=5.0 in /usr/local/lib/python3.8/dist-packages (from distributed>=2021.11.2->-r requirements.txt (line 2)) (5.9.1) Requirement already satisfied: sortedcontainers!=2.0.0,!=2.0.1 in /usr/local/lib/python3.8/dist-packages (from distributed>=2021.11.2->-r requirements.txt (line 2)) (2.4.0) Requirement already satisfied: tblib>=1.6.0 in /usr/local/lib/python3.8/dist-packages (from distributed>=2021.11.2->-r requirements.txt (line 2)) (1.7.0) Requirement already satisfied: tornado>=6.0.3 in /usr/local/lib/python3.8/dist-packages (from distributed>=2021.11.2->-r requirements.txt (line 2)) (6.1) Requirement already satisfied: zict>=0.1.3 in /usr/local/lib/python3.8/dist-packages (from distributed>=2021.11.2->-r requirements.txt (line 2)) (2.2.0) Requirement already satisfied: python-dateutil>=2.7.3 in /usr/local/lib/python3.8/dist-packages (from pandas<1.4.0dev0,>=1.2.0->-r requirements.txt (line 3)) (2.8.2) Requirement already satisfied: pytz>=2017.3 in /usr/local/lib/python3.8/dist-packages (from pandas<1.4.0dev0,>=1.2.0->-r requirements.txt (line 3)) (2022.1) Requirement already satisfied: numpy>=1.17.3; platform_machine != "aarch64" and platform_machine != "arm64" and python_version < "3.10" in /usr/local/lib/python3.8/dist-packages (from pandas<1.4.0dev0,>=1.2.0->-r requirements.txt (line 3)) (1.21.5) Requirement already satisfied: llvmlite<0.39,>=0.38.0rc1 in /usr/local/lib/python3.8/dist-packages (from numba>=0.54->-r requirements.txt (line 4)) (0.38.1) Requirement already satisfied: setuptools in /var/jenkins_home/.local/lib/python3.8/site-packages (from numba>=0.54->-r requirements.txt (line 4)) (62.4.0) Requirement already satisfied: absl-py<2.0.0,>=0.9 in /usr/local/lib/python3.8/dist-packages (from tensorflow-metadata>=1.2.0->-r requirements.txt (line 8)) (1.1.0) Requirement already satisfied: googleapis-common-protos<2,>=1.52.0 in /usr/local/lib/python3.8/dist-packages (from tensorflow-metadata>=1.2.0->-r requirements.txt (line 8)) (1.52.0) Requirement already satisfied: grpclib in /usr/local/lib/python3.8/dist-packages (from betterproto<2.0.0->-r requirements.txt (line 9)) (0.4.2) Requirement already satisfied: stringcase in /usr/local/lib/python3.8/dist-packages (from betterproto<2.0.0->-r requirements.txt (line 9)) (1.2.0) Requirement already satisfied: pyparsing!=3.0.5,>=2.0.2 in /usr/local/lib/python3.8/dist-packages (from packaging->-r requirements.txt (line 10)) (3.0.9) Requirement already satisfied: locket in /usr/local/lib/python3.8/dist-packages (from partd>=0.3.10->dask>=2021.11.2->-r requirements.txt (line 1)) (1.0.0) Requirement already satisfied: MarkupSafe>=2.0 in /usr/local/lib/python3.8/dist-packages (from jinja2->distributed>=2021.11.2->-r requirements.txt (line 2)) (2.0.1) Requirement already satisfied: heapdict in /usr/local/lib/python3.8/dist-packages (from zict>=0.1.3->distributed>=2021.11.2->-r requirements.txt (line 2)) (1.0.1) Requirement already satisfied: six>=1.5 in /var/jenkins_home/.local/lib/python3.8/site-packages (from python-dateutil>=2.7.3->pandas<1.4.0dev0,>=1.2.0->-r requirements.txt (line 3)) (1.15.0) Requirement already satisfied: h2<5,>=3.1.0 in /usr/local/lib/python3.8/dist-packages (from grpclib->betterproto<2.0.0->-r requirements.txt (line 9)) (4.1.0) Requirement already satisfied: multidict in /usr/local/lib/python3.8/dist-packages (from grpclib->betterproto<2.0.0->-r requirements.txt (line 9)) (6.0.2) Requirement already satisfied: hyperframe<7,>=6.0 in /usr/local/lib/python3.8/dist-packages (from h2<5,>=3.1.0->grpclib->betterproto<2.0.0->-r requirements.txt (line 9)) (6.0.1) Requirement already satisfied: hpack<5,>=4.0 in /usr/local/lib/python3.8/dist-packages (from h2<5,>=3.1.0->grpclib->betterproto<2.0.0->-r requirements.txt (line 9)) (4.0.0) ============================= test session starts ============================== platform linux -- Python 3.8.10, pytest-7.1.2, pluggy-1.0.0 rootdir: /var/jenkins_home/workspace/merlin_core/core, configfile: pyproject.toml plugins: anyio-3.6.1, xdist-2.5.0, forked-1.4.0, cov-3.0.0 collected 343 items / 1 skipped |
Documentation preview |
rerun tests |
Click to view CI ResultsGitHub pull request #114 of commit d000560b0578ef8dcdcc1dc9c6463d5a91164d0d, no merge conflicts. Running as SYSTEM Setting status of d000560b0578ef8dcdcc1dc9c6463d5a91164d0d to PENDING with url https://10.20.13.93:8080/job/merlin_core/99/console and message: 'Pending' Using context: Jenkins Building on master in workspace /var/jenkins_home/workspace/merlin_core using credential ce87ff3c-94f0-400a-8303-cb4acb4918b5 > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/NVIDIA-Merlin/core # timeout=10 Fetching upstream changes from https://github.com/NVIDIA-Merlin/core > git --version # timeout=10 using GIT_ASKPASS to set credentials login for merlin-systems username and pass > git fetch --tags --force --progress -- https://github.com/NVIDIA-Merlin/core +refs/pull/114/*:refs/remotes/origin/pr/114/* # timeout=10 > git rev-parse d000560b0578ef8dcdcc1dc9c6463d5a91164d0d^{commit} # timeout=10 Checking out Revision d000560b0578ef8dcdcc1dc9c6463d5a91164d0d (detached) > git config core.sparsecheckout # timeout=10 > git checkout -f d000560b0578ef8dcdcc1dc9c6463d5a91164d0d # timeout=10 Commit message: "Update `versioneer` from 0.21 to 0.23" > git rev-list --no-walk 9408224520d731c51b7952a43def675b76e81756 # timeout=10 [merlin_core] $ /bin/bash /tmp/jenkins8069296641562108724.sh ============================= test session starts ============================== platform linux -- Python 3.8.10, pytest-7.1.2, pluggy-1.0.0 rootdir: /var/jenkins_home/workspace/merlin_core/core, configfile: pyproject.toml plugins: anyio-3.6.1, xdist-2.5.0, forked-1.4.0, cov-3.0.0 collected 343 items / 1 skipped |
Click to view CI ResultsGitHub pull request #114 of commit 5c431330c7a782eae5e4bcef3a628ce76281825c, no merge conflicts. Running as SYSTEM Setting status of 5c431330c7a782eae5e4bcef3a628ce76281825c to PENDING with url https://10.20.13.93:8080/job/merlin_core/101/console and message: 'Pending' Using context: Jenkins Building on master in workspace /var/jenkins_home/workspace/merlin_core using credential ce87ff3c-94f0-400a-8303-cb4acb4918b5 > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/NVIDIA-Merlin/core # timeout=10 Fetching upstream changes from https://github.com/NVIDIA-Merlin/core > git --version # timeout=10 using GIT_ASKPASS to set credentials login for merlin-systems username and pass > git fetch --tags --force --progress -- https://github.com/NVIDIA-Merlin/core +refs/pull/114/*:refs/remotes/origin/pr/114/* # timeout=10 > git rev-parse 5c431330c7a782eae5e4bcef3a628ce76281825c^{commit} # timeout=10 Checking out Revision 5c431330c7a782eae5e4bcef3a628ce76281825c (detached) > git config core.sparsecheckout # timeout=10 > git checkout -f 5c431330c7a782eae5e4bcef3a628ce76281825c # timeout=10 Commit message: "Merge branch 'main' into versioneer-update-0.23" > git rev-list --no-walk 9408224520d731c51b7952a43def675b76e81756 # timeout=10 [merlin_core] $ /bin/bash /tmp/jenkins17532358910714575438.sh ============================= test session starts ============================== platform linux -- Python 3.8.10, pytest-7.1.2, pluggy-1.0.0 rootdir: /var/jenkins_home/workspace/merlin_core/core, configfile: pyproject.toml plugins: anyio-3.6.1, xdist-2.5.0, forked-1.4.0, cov-3.0.0 collected 343 items / 1 skipped |
The update to versioneer in #114 resulted in us not getting versions from git. This is because we weren't specifying the tag_prefix appropriately, and this broke newer versions of versioneer. Fix and add a basic unittest that would catch issues like this in the future
* Fix versioneer to get accurate version numbers The update to versioneer in #114 resulted in us not getting versions from git. This is because we weren't specifying the tag_prefix appropriately, and this broke newer versions of versioneer. Fix and add a basic unittest that would catch issues like this in the future * flake8 Co-authored-by: Karl Higley <kmhigley@gmail.com>
Goals ⚽
Restore editable install support with latest version of setuptools (without requiring setting any environment variables to activate legacy support).
Implementation Details 🚧
Ran the following
There are a few changes since we last configured versioneer (0.21).
The relevant change we're after to fix the editable install is in release 0.23 which added a patch for compatibility with the new
setuptools
release.Testing Details 🔍
Checked that the following works locally:
pip install -e .