From 93e1471db016b2498210532dd286e98203748dc3 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Wed, 5 Jul 2023 13:58:13 -0700 Subject: [PATCH 01/56] update to cuda12 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 10 +++++----- conda/environments/all_cuda-120_arch-x86_64.yaml | 12 ++++++------ conda/recipes/cuxfilter/meta.yaml | 9 ++++----- dependencies.yaml | 10 +++++----- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index ffc271c9..85e69634 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -9,12 +9,12 @@ dependencies: - bokeh>=2.4.2,<=2.5 - cuda-version=11.8 - cudatoolkit -- cudf==23.8.* -- cugraph==23.8.* +- cudf=23.08.* +- cugraph=23.08.* - cupy>=12.0.0 -- cuspatial==23.8.* -- dask-cuda==23.8.* -- dask-cudf==23.8.* +- cuspatial=23.08.* +- dask-cuda=23.08.* +- dask-cudf=23.08.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index 89bc099c..254301df 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -8,12 +8,12 @@ channels: dependencies: - bokeh>=2.4.2,<=2.5 - cuda-version=12.0 -- cudf==23.8.* -- cugraph==23.8.* +- cudf=23.08.* +- cugraph=23.08.* - cupy>=12.0.0 -- cuspatial==23.8.* -- dask-cuda==23.8.* -- dask-cudf==23.8.* +- cuspatial=23.08.* +- dask-cuda=23.08.* +- dask-cudf=23.08.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 @@ -29,7 +29,7 @@ dependencies: - numpydoc - packaging - pandoc<=2.0.0 -- panel>=0.14.0,<=0.14.1 +- panel >=0.14.0,<=0.14.1 - pre-commit - pydeck>=0.3,<=0.5.0 - pyppeteer>=0.2.6 diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml index ba09730a..948c447a 100644 --- a/conda/recipes/cuxfilter/meta.yaml +++ b/conda/recipes/cuxfilter/meta.yaml @@ -1,7 +1,6 @@ # Copyright (c) 2018-2023, NVIDIA CORPORATION. {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %} -{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %} {% set cuda_major = cuda_version.split('.')[0] %} {% set py_version = environ['CONDA_PY'] %} @@ -25,11 +24,11 @@ requirements: - cuda-version ={{ cuda_version }} run: - bokeh >=2.4.2,<=2.5 - - cudf ={{ minor_version }} + - cudf ={{ version }} - cupy >=12.0.0 - - cuspatial ={{ minor_version }} - - dask-cuda ={{ minor_version }} - - dask-cudf ={{ minor_version }} + - cuspatial ={{ version }} + - dask-cuda ={{ version }} + - dask-cudf ={{ version }} - datashader >=0.15 - geopandas >=0.11.0 - holoviews>=1.15.0,<=1.15.4 diff --git a/dependencies.yaml b/dependencies.yaml index 01e3f51f..b6c79700 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -96,7 +96,7 @@ dependencies: - notebook>=0.5.0 - output_types: [conda] packages: - - cugraph==23.8.* + - cugraph=23.08.* py_version: specific: - output_types: conda @@ -117,10 +117,10 @@ dependencies: - output_types: [conda, requirements] packages: - bokeh>=2.4.2,<=2.5 - - cudf==23.8.* - - cuspatial==23.8.* - - dask-cuda==23.8.* - - dask-cudf==23.8.* + - cudf=23.08.* + - cuspatial=23.08.* + - dask-cuda=23.08.* + - dask-cudf=23.08.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 From 952d660134bc26bcfd3e227d6113647016114a65 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 30 Jun 2023 10:50:12 -0700 Subject: [PATCH 02/56] migrate to pyproject.toml --- .flake8 | 11 + .pre-commit-config.yaml | 14 +- python/Makefile | 5 - python/pyproject.toml | 36 + python/record.txt | 125 --- python/setup.cfg | 15 - python/setup.py | 28 +- python/versioneer.py | 1903 --------------------------------------- 8 files changed, 59 insertions(+), 2078 deletions(-) create mode 100644 .flake8 delete mode 100644 python/Makefile create mode 100644 python/pyproject.toml delete mode 100644 python/record.txt delete mode 100644 python/setup.cfg delete mode 100644 python/versioneer.py diff --git a/.flake8 b/.flake8 new file mode 100644 index 00000000..0c711576 --- /dev/null +++ b/.flake8 @@ -0,0 +1,11 @@ +# Copyright (c) 2023, NVIDIA CORPORATION. + +[flake8] +filename = *.py, +exclude = __init__.py, *.egg, build, docs, .git +force-check = True +ignore = + # line break before binary operator + W503, + # whitespace before : + E203 \ No newline at end of file diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3f63b863..58b406de 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,17 +2,25 @@ repos: - repo: https://github.com/psf/black - rev: 22.10.0 + rev: 22.3.0 hooks: - id: black files: python/cuxfilter/.* # Explicitly specify the pyproject.toml at the repo root, not per-project. args: ["--config", "pyproject.toml"] - repo: https://github.com/PyCQA/flake8 - rev: 6.0.0 + rev: 5.0.4 hooks: - id: flake8 - args: ["--config=python/setup.cfg"] + args: ["--config=.flake8"] files: python/.*$ + types: [file] + types_or: [python, cython] + additional_dependencies: ["flake8-force"] + - repo: https://github.com/rapidsai/dependency-file-generator + rev: v1.5.1 + hooks: + - id: rapids-dependency-file-generator + args: ["--clean"] default_language_version: python: python3 diff --git a/python/Makefile b/python/Makefile deleted file mode 100644 index 4c1e63a3..00000000 --- a/python/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -init: - conda env update --file ../conda/environments/cuxfilter_dev_cuda10.0.yml - -test: - nosetests tests diff --git a/python/pyproject.toml b/python/pyproject.toml new file mode 100644 index 00000000..3d91fac1 --- /dev/null +++ b/python/pyproject.toml @@ -0,0 +1,36 @@ +# Copyright (c) 2023, NVIDIA CORPORATION. + +[build-system] +build-backend = "setuptools.build_meta" +requires = [] + +[project] +name = "cuxfilter" +version = "23.08.00" +description = "GPU accelerated cross filtering with cuDF" +readme = { file = "README.md", content_type = "text/markdown" } +authors = [ + {name = "NVIDIA Corporation"}, +] +license = { text = "Apache 2.0" } +requires-python = ">=3.9" +dependencies = [] +classifiers = [ + "Intended Audience :: Developers", + "Topic :: Database", + "Topic :: Scientific/Engineering :: Visualization", + "License :: OSI Approved :: Apache Software License", + "Programming Language :: Python", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", +] + +[project.optional-dependencies] +test = [] + +[project.urls] +Homepage = "https://github.com/rapidsai/cuxfilter" +Documentation = "https://docs.rapids.ai/api/cuxfilter/stable/" + +[tool.setuptools] +license-files = ["LICENSE"] diff --git a/python/record.txt b/python/record.txt deleted file mode 100644 index 76dbafd8..00000000 --- a/python/record.txt +++ /dev/null @@ -1,125 +0,0 @@ -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/dataframe.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/_version.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/dashboard.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/datatile.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/layout_templates.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/layouts.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/chart_views.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/custom_tiles.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/get_open_port.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/screengrab.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/geojson_mapper.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/rapids.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/light.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/dark.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/test_dashboard.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/test_datatile.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/test_dataframe.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/download_datasets.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/unemployment_data_from_bokeh.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/random_signals.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/numba_kernels/gpu_datatile.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/numba_kernels/gpu_histogram.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/numba_kernels/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/bokeh/plots.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/bokeh/bokeh.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/bokeh/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/cudatashader.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/plots.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/core_view_dataframe.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/core_widget.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/core_chart.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/panel_widgets/plots.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/panel_widgets/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/panel_widgets/panel_widgets.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/altair/altair.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/altair/plots.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/altair/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/custom_extensions/interactive_image.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/custom_extensions/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/core_non_aggregate.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/core_scatter_geo.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/core_line.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/core_stacked_line.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/core_scatter.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/core_aggregate.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/core_aggregate_bar.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/core_aggregate_choropleth.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/core_aggregate_line.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/core_datasize_indicator.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/__pycache__/dataframe.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/__pycache__/_version.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/__pycache__/dashboard.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/__pycache__/datatile.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/__pycache__/layout_templates.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/__pycache__/layouts.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/__pycache__/chart_views.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/__pycache__/custom_tiles.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/__pycache__/get_open_port.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/__pycache__/screengrab.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/__pycache__/geojson_mapper.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/__pycache__/rapids.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/__pycache__/light.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/__pycache__/dark.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/__pycache__/test_dashboard.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/__pycache__/test_datatile.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/__pycache__/test_dataframe.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/__pycache__/download_datasets.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/__pycache__/unemployment_data_from_bokeh.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/__pycache__/random_signals.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/numba_kernels/__pycache__/gpu_datatile.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/numba_kernels/__pycache__/gpu_histogram.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/numba_kernels/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/bokeh/__pycache__/plots.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/bokeh/__pycache__/bokeh.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/bokeh/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/__pycache__/cudatashader.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/__pycache__/plots.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/__pycache__/core_view_dataframe.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/__pycache__/core_widget.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/__pycache__/core_chart.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/panel_widgets/__pycache__/plots.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/panel_widgets/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/panel_widgets/__pycache__/panel_widgets.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/altair/__pycache__/altair.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/altair/__pycache__/plots.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/altair/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/custom_extensions/__pycache__/interactive_image.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/custom_extensions/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/__pycache__/core_non_aggregate.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/__pycache__/core_scatter_geo.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/__pycache__/core_line.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/__pycache__/core_stacked_line.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/__pycache__/core_scatter.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/__pycache__/core_aggregate.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/__pycache__/core_aggregate_bar.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/__pycache__/core_aggregate_choropleth.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/__pycache__/core_aggregate_line.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/__pycache__/core_datasize_indicator.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter-0+untagged.395.g5cf055f.dirty-py3.6.egg-info/SOURCES.txt -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter-0+untagged.395.g5cf055f.dirty-py3.6.egg-info/PKG-INFO -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter-0+untagged.395.g5cf055f.dirty-py3.6.egg-info/top_level.txt -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter-0+untagged.395.g5cf055f.dirty-py3.6.egg-info/not-zip-safe -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter-0+untagged.395.g5cf055f.dirty-py3.6.egg-info/dependency_links.txt diff --git a/python/setup.cfg b/python/setup.cfg deleted file mode 100644 index bc8503f6..00000000 --- a/python/setup.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[versioneer] -VCS = git -style = pep440 -versionfile_source = cuxfilter/_version.py -versionfile_build = cuxfilter/_version.py -tag_prefix = v -parentdir_prefix = cuxfilter- - -[flake8] -exclude = __init__.py -ignore = - # line break before binary operator - W503 - # whitespace before : - E203 diff --git a/python/setup.py b/python/setup.py index e4622221..951b8247 100644 --- a/python/setup.py +++ b/python/setup.py @@ -1,36 +1,10 @@ from setuptools import find_packages, setup -import versioneer - -with open("README.md") as f: - readme = f.read() setup( - name="cuxfilter", - version=versioneer.get_version(), - description="GPU accelerated cross filtering with cuDF", - url="https://github.com/rapidsai/cuxfilter", - author="NVIDIA Corporation", - license="Apache 2.0", - classifiers=[ - "Intended Audience :: Developers", - "Topic :: Database", - "Topic :: Scientific/Engineering", - "License :: OSI Approved :: Apache Software License", - "Programming Language :: Python", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - ], packages=find_packages( include=["cuxfilter", "cuxfilter.*"], exclude=("tests", "docs", "notebooks"), ), - package_data=dict.fromkeys( - find_packages( - include=["cuxfilter.layouts.assets", "cuxfilter.themes.assets"] - ), - ["*.css", "*.html"], - ), - cmdclass=versioneer.get_cmdclass(), + package_data={"cuxfilter.themes.assets": ["*.css", "*.html"]}, zip_safe=False, ) diff --git a/python/versioneer.py b/python/versioneer.py deleted file mode 100644 index 3ac0310a..00000000 --- a/python/versioneer.py +++ /dev/null @@ -1,1903 +0,0 @@ -# Version: 0.18 - -"""The Versioneer - like a rocketeer, but for versions. - -The Versioneer -============== - -* like a rocketeer, but for versions! -* https://github.com/warner/python-versioneer -* Brian Warner -* License: Public Domain -* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, and pypy -* [![Latest Version] -(https://pypip.in/version/versioneer/badge.svg?style=flat) -](https://pypi.python.org/pypi/versioneer/) -* [![Build Status] -(https://travis-ci.org/warner/python-versioneer.png?branch=master) -](https://travis-ci.org/warner/python-versioneer) - -This is a tool for managing a recorded version number in distutils-based -python projects. The goal is to remove the tedious and error-prone "update -the embedded version string" step from your release process. Making a new -release should be as easy as recording a new tag in your version-control -system, and maybe making new tarballs. - - -## Quick Install - -* `pip install versioneer` to somewhere to your $PATH -* add a `[versioneer]` section to your setup.cfg (see below) -* run `versioneer install` in your source tree, commit the results - -## Version Identifiers - -Source trees come from a variety of places: - -* a version-control system checkout (mostly used by developers) -* a nightly tarball, produced by build automation -* a snapshot tarball, produced by a web-based VCS browser, like github's - "tarball from tag" feature -* a release tarball, produced by "setup.py sdist", distributed through PyPI - -Within each source tree, the version identifier (either a string or a number, -this tool is format-agnostic) can come from a variety of places: - -* ask the VCS tool itself, e.g. "git describe" (for checkouts), which knows - about recent "tags" and an absolute revision-id -* the name of the directory into which the tarball was unpacked -* an expanded VCS keyword ($Id$, etc) -* a `_version.py` created by some earlier build step - -For released software, the version identifier is closely related to a VCS -tag. Some projects use tag names that include more than just the version -string (e.g. "myproject-1.2" instead of just "1.2"), in which case the tool -needs to strip the tag prefix to extract the version identifier. For -unreleased software (between tags), the version identifier should provide -enough information to help developers recreate the same tree, while also -giving them an idea of roughly how old the tree is (after version 1.2, before -version 1.3). Many VCS systems can report a description that captures this, -for example `git describe --tags --dirty --always` reports things like -"0.7-1-g574ab98-dirty" to indicate that the checkout is one revision past the -0.7 tag, has a unique revision id of "574ab98", and is "dirty" (it has -uncommitted changes. - -The version identifier is used for multiple purposes: - -* to allow the module to self-identify its version: `myproject.__version__` -* to choose a name and prefix for a 'setup.py sdist' tarball - -## Theory of Operation - -Versioneer works by adding a special `_version.py` file into your source -tree, where your `__init__.py` can import it. This `_version.py` knows how to -dynamically ask the VCS tool for version information at import time. - -`_version.py` also contains `$Revision$` markers, and the installation -process marks `_version.py` to have this marker rewritten with a tag name -during the `git archive` command. As a result, generated tarballs will -contain enough information to get the proper version. - -To allow `setup.py` to compute a version too, a `versioneer.py` is added to -the top level of your source tree, next to `setup.py` and the `setup.cfg` -that configures it. This overrides several distutils/setuptools commands to -compute the version when invoked, and changes `setup.py build` and `setup.py -sdist` to replace `_version.py` with a small static file that contains just -the generated version data. - -## Installation - -See [INSTALL.md](./INSTALL.md) for detailed installation instructions. - -## Version-String Flavors - -Code which uses Versioneer can learn about its version string at runtime by -importing `_version` from your main `__init__.py` file and running the -`get_versions()` function. From the "outside" (e.g. in `setup.py`), you can -import the top-level `versioneer.py` and run `get_versions()`. - -Both functions return a dictionary with different flavors of version -information: - -* `['version']`: A condensed version string, rendered using the selected - style. This is the most commonly used value for the project's version - string. The default "pep440" style yields strings like `0.11`, - `0.11+2.g1076c97`, or `0.11+2.g1076c97.dirty`. See the "Styles" section - below for alternative styles. - -* `['full-revisionid']`: detailed revision identifier. For Git, this is the - full SHA1 commit id, e.g. "1076c978a8d3cfc70f408fe5974aa6c092c949ac". - -* `['date']`: Date and time of the latest `HEAD` commit. For Git, it is the - commit date in ISO 8601 format. This will be None if the date is not - available. - -* `['dirty']`: a boolean, True if the tree has uncommitted changes. Note that - this is only accurate if run in a VCS checkout, otherwise it is likely to - be False or None - -* `['error']`: if the version string could not be computed, this will be set - to a string describing the problem, otherwise it will be None. It may be - useful to throw an exception in setup.py if this is set, to avoid e.g. - creating tarballs with a version string of "unknown". - -Some variants are more useful than others. Including `full-revisionid` in a -bug report should allow developers to reconstruct the exact code being tested -(or indicate the presence of local changes that should be shared with the -developers). `version` is suitable for display in an "about" box or a CLI -`--version` output: it can be easily compared against release notes and lists -of bugs fixed in various releases. - -The installer adds the following text to your `__init__.py` to place a basic -version in `YOURPROJECT.__version__`: - - from ._version import get_versions - __version__ = get_versions()['version'] - del get_versions - -## Styles - -The setup.cfg `style=` configuration controls how the VCS information is -rendered into a version string. - -The default style, "pep440", produces a PEP440-compliant string, equal to the -un-prefixed tag name for actual releases, and containing an additional "local -version" section with more detail for in-between builds. For Git, this is -TAG[+DISTANCE.gHEX[.dirty]] , using information from `git describe --tags ---dirty --always`. For example "0.11+2.g1076c97.dirty" indicates that the -tree is like the "1076c97" commit but has uncommitted changes (".dirty"), and -that this commit is two revisions ("+2") beyond the "0.11" tag. For released -software (exactly equal to a known tag), the identifier will only contain the -stripped tag, e.g. "0.11". - -Other styles are available. See [details.md](details.md) in the Versioneer -source tree for descriptions. - -## Debugging - -Versioneer tries to avoid fatal errors: if something goes wrong, it will tend -to return a version of "0+unknown". To investigate the problem, run `setup.py -version`, which will run the version-lookup code in a verbose mode, and will -display the full contents of `get_versions()` (including the `error` string, -which may help identify what went wrong). - -## Known Limitations - -Some situations are known to cause problems for Versioneer. This details the -most significant ones. More can be found on Github -[issues page](https://github.com/warner/python-versioneer/issues). - -### Subprojects - -Versioneer has limited support for source trees in which `setup.py` is not in -the root directory (e.g. `setup.py` and `.git/` are *not* siblings). The are -two common reasons why `setup.py` might not be in the root: - -* Source trees which contain multiple subprojects, such as - [Buildbot](https://github.com/buildbot/buildbot), which contains both - "master" and "slave" subprojects, each with their own `setup.py`, - `setup.cfg`, and `tox.ini`. Projects like these produce multiple PyPI - distributions (and upload multiple independently-installable tarballs). -* Source trees whose main purpose is to contain a C library, but which also - provide bindings to Python (and perhaps other langauges) in subdirectories. - -Versioneer will look for `.git` in parent directories, and most operations -should get the right version string. However `pip` and `setuptools` have bugs -and implementation details which frequently cause `pip install .` from a -subproject directory to fail to find a correct version string (so it usually -defaults to `0+unknown`). - -`pip install --editable .` should work correctly. `setup.py install` might -work too. - -Pip-8.1.1 is known to have this problem, but hopefully it will get fixed in -some later version. - -[Bug #38](https://github.com/warner/python-versioneer/issues/38) is tracking -this issue. The discussion in -[PR #61](https://github.com/warner/python-versioneer/pull/61) describes the -issue from the Versioneer side in more detail. -[pip PR#3176](https://github.com/pypa/pip/pull/3176) and -[pip PR#3615](https://github.com/pypa/pip/pull/3615) contain work to improve -pip to let Versioneer work correctly. - -Versioneer-0.16 and earlier only looked for a `.git` directory next to the -`setup.cfg`, so subprojects were completely unsupported with those releases. - -### Editable installs with setuptools <= 18.5 - -`setup.py develop` and `pip install --editable .` allow you to install a -project into a virtualenv once, then continue editing the source code (and -test) without re-installing after every change. - -"Entry-point scripts" (`setup(entry_points={"console_scripts": ..})`) are a -convenient way to specify executable scripts that should be installed along -with the python package. - -These both work as expected when using modern setuptools. When using -setuptools-18.5 or earlier, however, certain operations will cause -`pkg_resources.DistributionNotFound` errors when running the entrypoint -script, which must be resolved by re-installing the package. This happens -when the install happens with one version, then the egg_info data is -regenerated while a different version is checked out. Many setup.py commands -cause egg_info to be rebuilt (including `sdist`, `wheel`, and installing into -a different virtualenv), so this can be surprising. - -[Bug #83](https://github.com/warner/python-versioneer/issues/83) describes -this one, but upgrading to a newer version of setuptools should probably -resolve it. - -### Unicode version strings - -While Versioneer works (and is continually tested) with both Python 2 and -Python 3, it is not entirely consistent with bytes-vs-unicode distinctions. -Newer releases probably generate unicode version strings on py2. It's not -clear that this is wrong, but it may be surprising for applications when then -write these strings to a network connection or include them in bytes-oriented -APIs like cryptographic checksums. - -[Bug #71](https://github.com/warner/python-versioneer/issues/71) investigates -this question. - - -## Updating Versioneer - -To upgrade your project to a new release of Versioneer, do the following: - -* install the new Versioneer (`pip install -U versioneer` or equivalent) -* edit `setup.cfg`, if necessary, to include any new configuration settings - indicated by the release notes. See [UPGRADING](./UPGRADING.md) for details. -* re-run `versioneer install` in your source tree, to replace - `SRC/_version.py` -* commit any changed files - -## Future Directions - -This tool is designed to make it easily extended to other version-control -systems: all VCS-specific components are in separate directories like -src/git/ . The top-level `versioneer.py` script is assembled from these -components by running make-versioneer.py . In the future, make-versioneer.py -will take a VCS name as an argument, and will construct a version of -`versioneer.py` that is specific to the given VCS. It might also take the -configuration arguments that are currently provided manually during -installation by editing setup.py . Alternatively, it might go the other -direction and include code from all supported VCS systems, reducing the -number of intermediate scripts. - - -## License - -To make Versioneer easier to embed, all its code is dedicated to the public -domain. The `_version.py` that it creates is also in the public domain. -Specifically, both are released under the Creative Commons "Public Domain -Dedication" license (CC0-1.0), as described in -https://creativecommons.org/publicdomain/zero/1.0/ . - -""" - -from __future__ import print_function - -try: - import configparser -except ImportError: - import ConfigParser as configparser -import errno -import json -import os -import re -import subprocess -import sys - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_root(): - """Get the project root directory. - - We require that all commands are run from the project root, i.e. the - directory that contains setup.py, setup.cfg, and versioneer.py . - """ - root = os.path.realpath(os.path.abspath(os.getcwd())) - setup_py = os.path.join(root, "setup.py") - versioneer_py = os.path.join(root, "versioneer.py") - if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): - # allow 'python path/to/setup.py COMMAND' - root = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0]))) - setup_py = os.path.join(root, "setup.py") - versioneer_py = os.path.join(root, "versioneer.py") - if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): - err = ( - "Versioneer was unable to run the project root directory. " - "Versioneer requires setup.py to be executed from " - "its immediate directory (like 'python setup.py COMMAND'), " - "or in a way that lets it use sys.argv[0] to find the root " - "(like 'python path/to/setup.py COMMAND')." - ) - raise VersioneerBadRootError(err) - try: - # Certain runtime workflows (setup.py install/develop in a setuptools - # tree) execute all dependencies in a single python process, so - # "versioneer" may be imported multiple times, and python's shared - # module-import table will cache the first one. So we can't use - # os.path.dirname(__file__), as that will find whichever - # versioneer.py was first imported, even in later projects. - me = os.path.realpath(os.path.abspath(__file__)) - me_dir = os.path.normcase(os.path.splitext(me)[0]) - vsr_dir = os.path.normcase(os.path.splitext(versioneer_py)[0]) - if me_dir != vsr_dir: - print( - "Warning: build in %s is using versioneer.py from %s" - % (os.path.dirname(me), versioneer_py) - ) - except NameError: - pass - return root - - -def get_config_from_root(root): - """Read the project setup.cfg file to determine Versioneer config.""" - # This might raise EnvironmentError (if setup.cfg is missing), or - # configparser.NoSectionError (if it lacks a [versioneer] section), or - # configparser.NoOptionError (if it lacks "VCS="). See the docstring at - # the top of versioneer.py for instructions on writing your setup.cfg . - setup_cfg = os.path.join(root, "setup.cfg") - parser = configparser.SafeConfigParser() - with open(setup_cfg, "r") as f: - parser.readfp(f) - VCS = parser.get("versioneer", "VCS") # mandatory - - def get(parser, name): - if parser.has_option("versioneer", name): - return parser.get("versioneer", name) - return None - - cfg = VersioneerConfig() - cfg.VCS = VCS - cfg.style = get(parser, "style") or "" - cfg.versionfile_source = get(parser, "versionfile_source") - cfg.versionfile_build = get(parser, "versionfile_build") - cfg.tag_prefix = get(parser, "tag_prefix") - if cfg.tag_prefix in ("''", '""'): - cfg.tag_prefix = "" - cfg.parentdir_prefix = get(parser, "parentdir_prefix") - cfg.verbose = get(parser, "verbose") - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -# these dictionaries contain VCS-specific tools -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - - return decorate - - -def run_command( - commands, args, cwd=None, verbose=False, hide_stderr=False, env=None -): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen( - [c] + args, - cwd=cwd, - env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr else None), - ) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %s" % dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %s" % (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) - return None, p.returncode - return stdout, p.returncode - - -LONG_VERSION_PY[ - "git" -] = ''' -# This file helps to compute a version number in source trees obtained from -# git-archive tarball (such as those provided by githubs download-from-tag -# feature). Distribution tarballs (built by setup.py sdist) and build -# directories (produced by setup.py build) will contain a much shorter file -# that just contains the computed version number. - -# This file is released into the public domain. Generated by -# versioneer-0.18 (https://github.com/warner/python-versioneer) - -"""Git implementation of _version.py.""" - -import errno -import os -import re -import subprocess -import sys - - -def get_keywords(): - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must - # each be defined on a line of their own. _version.py will just call - # get_keywords(). - git_refnames = "%(DOLLAR)sFormat:%%d%(DOLLAR)s" - git_full = "%(DOLLAR)sFormat:%%H%(DOLLAR)s" - git_date = "%(DOLLAR)sFormat:%%ci%(DOLLAR)s" - keywords = {"refnames": git_refnames, "full": git_full, "date": git_date} - return keywords - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_config(): - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py - cfg = VersioneerConfig() - cfg.VCS = "git" - cfg.style = "%(STYLE)s" - cfg.tag_prefix = "%(TAG_PREFIX)s" - cfg.parentdir_prefix = "%(PARENTDIR_PREFIX)s" - cfg.versionfile_source = "%(VERSIONFILE_SOURCE)s" - cfg.verbose = False - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - return decorate - - -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - env=None): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen([c] + args, cwd=cwd, env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %%s" %% dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %%s" %% (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %%s (error)" %% dispcmd) - print("stdout was %%s" %% stdout) - return None, p.returncode - return stdout, p.returncode - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %%s but none started with prefix %%s" %% - (str(rootdirs), parentdir_prefix)) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search('=\\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search('=\\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search('=\\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %%d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search('\\d', r)]) - if verbose: - print("discarding '%%s', no digits" %% ",".join(refs - tags)) - if verbose: - print("likely tags: %%s" %% ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] - if verbose: - print("picking %%s" %% r) - return {"version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": None, - "date": date} - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return {"version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": "no suitable tags", "date": None} - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, - hide_stderr=True) - if rc != 0: - if verbose: - print("Directory %%s not under git control" %% root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", - "--always", "--long", - "--match", "%%s*" %% tag_prefix], - cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[:git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search('^(.+)-(\\d+)-g([0-9a-f]+)$', git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%%s'" - %% describe_out) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%%s' doesn't start with prefix '%%s'" - print(fmt %% (full_tag, tag_prefix)) - pieces["error"] = ("tag '%%s' doesn't start with prefix '%%s'" - %% (full_tag, tag_prefix)) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix):] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], - cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%%ci", "HEAD"], - cwd=root)[0].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%%d.g%%s" %% (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%%d.g%%s" %% (pieces["distance"], - pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%%d" %% pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%%d" %% pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%%s" %% pieces["short"] - else: - # exception #1 - rendered = "0.post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%%s" %% pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None} - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%%s'" %% style) - - return {"version": rendered, "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], "error": None, - "date": pieces.get("date")} - - -def get_versions(): - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some - # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which - # case we can only use expanded keywords. - - cfg = get_config() - verbose = cfg.verbose - - try: - return git_versions_from_keywords(get_keywords(), cfg.tag_prefix, - verbose) - except NotThisMethod: - pass - - try: - root = os.path.realpath(__file__) - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. - for i in cfg.versionfile_source.split('/'): - root = os.path.dirname(root) - except NameError: - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to find root of source tree", - "date": None} - - try: - pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose) - return render(pieces, cfg.style) - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - return versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - except NotThisMethod: - pass - - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to compute version", "date": None} -''' - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG) :] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r"\d", r)]) - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: - print("likely tags: %s" % ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix) :] - if verbose: - print("picking %s" % r) - return { - "version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, - "error": None, - "date": date, - } - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return { - "version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, - "error": "no suitable tags", - "date": None, - } - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command( - GITS, ["rev-parse", "--git-dir"], cwd=root, hide_stderr=True - ) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command( - GITS, - [ - "describe", - "--tags", - "--dirty", - "--always", - "--long", - "--match", - "%s*" % tag_prefix, - ], - cwd=root, - ) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[: git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ( - "unable to parse git-describe output: '%s'" % describe_out - ) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) - pieces["error"] = "tag '%s' doesn't start with prefix '%s'" % ( - full_tag, - tag_prefix, - ) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix) :] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command( - GITS, ["rev-list", "HEAD", "--count"], cwd=root - ) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], cwd=root)[ - 0 - ].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def do_vcs_install(manifest_in, versionfile_source, ipy): - """Git-specific installation logic for Versioneer. - - For Git, this means creating/changing .gitattributes to mark _version.py - for export-subst keyword substitution. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - files = [manifest_in, versionfile_source] - if ipy: - files.append(ipy) - try: - me = __file__ - if me.endswith(".pyc") or me.endswith(".pyo"): - me = os.path.splitext(me)[0] + ".py" - versioneer_file = os.path.relpath(me) - except NameError: - versioneer_file = "versioneer.py" - files.append(versioneer_file) - present = False - try: - f = open(".gitattributes", "r") - for line in f.readlines(): - if line.strip().startswith(versionfile_source): - if "export-subst" in line.strip().split()[1:]: - present = True - f.close() - except EnvironmentError: - pass - if not present: - f = open(".gitattributes", "a+") - f.write("%s export-subst\n" % versionfile_source) - f.close() - files.append(".gitattributes") - run_command(GITS, ["add", "--"] + files) - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return { - "version": dirname[len(parentdir_prefix) :], - "full-revisionid": None, - "dirty": False, - "error": None, - "date": None, - } - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print( - "Tried directories %s but none started with prefix %s" - % (str(rootdirs), parentdir_prefix) - ) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -SHORT_VERSION_PY = """ -# This file was generated by 'versioneer.py' (0.18) from -# revision-control system data, or from the parent directory name of an -# unpacked source archive. Distribution tarballs contain a pre-generated copy -# of this file. - -import json - -version_json = ''' -%s -''' # END VERSION_JSON - - -def get_versions(): - return json.loads(version_json) -""" - - -def versions_from_file(filename): - """Try to determine the version from _version.py if present.""" - try: - with open(filename) as f: - contents = f.read() - except EnvironmentError: - raise NotThisMethod("unable to read _version.py") - mo = re.search( - r"version_json = '''\n(.*)''' # END VERSION_JSON", - contents, - re.M | re.S, - ) - if not mo: - mo = re.search( - r"version_json = '''\r\n(.*)''' # END VERSION_JSON", - contents, - re.M | re.S, - ) - if not mo: - raise NotThisMethod("no version_json in _version.py") - return json.loads(mo.group(1)) - - -def write_to_version_file(filename, versions): - """Write the given version number to the given _version.py file.""" - os.unlink(filename) - contents = json.dumps( - versions, sort_keys=True, indent=1, separators=(",", ": ") - ) - with open(filename, "w") as f: - f.write(SHORT_VERSION_PY % contents) - - print("set %s to '%s'" % (filename, versions["version"])) - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%d" % pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%d" % pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%s" % pieces["short"] - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%s" % pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return { - "version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None, - } - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%s'" % style) - - return { - "version": rendered, - "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], - "error": None, - "date": pieces.get("date"), - } - - -class VersioneerBadRootError(Exception): - """The project root directory is unknown or missing key files.""" - - -def get_versions(verbose=False): - """Get the project version from whatever source is available. - - Returns dict with two keys: 'version' and 'full'. - """ - if "versioneer" in sys.modules: - # see the discussion in cmdclass.py:get_cmdclass() - del sys.modules["versioneer"] - - root = get_root() - cfg = get_config_from_root(root) - - assert cfg.VCS is not None, "please set [versioneer]VCS= in setup.cfg" - handlers = HANDLERS.get(cfg.VCS) - assert handlers, "unrecognized VCS '%s'" % cfg.VCS - verbose = verbose or cfg.verbose - assert ( - cfg.versionfile_source is not None - ), "please set versioneer.versionfile_source" - assert cfg.tag_prefix is not None, "please set versioneer.tag_prefix" - - versionfile_abs = os.path.join(root, cfg.versionfile_source) - - # extract version from first of: _version.py, VCS command (e.g. 'git - # describe'), parentdir. This is meant to work for developers using a - # source checkout, for users of a tarball created by 'setup.py sdist', - # and for users of a tarball/zipball created by 'git archive' or github's - # download-from-tag feature or the equivalent in other VCSes. - - get_keywords_f = handlers.get("get_keywords") - from_keywords_f = handlers.get("keywords") - if get_keywords_f and from_keywords_f: - try: - keywords = get_keywords_f(versionfile_abs) - ver = from_keywords_f(keywords, cfg.tag_prefix, verbose) - if verbose: - print("got version from expanded keyword %s" % ver) - return ver - except NotThisMethod: - pass - - try: - ver = versions_from_file(versionfile_abs) - if verbose: - print("got version from file %s %s" % (versionfile_abs, ver)) - return ver - except NotThisMethod: - pass - - from_vcs_f = handlers.get("pieces_from_vcs") - if from_vcs_f: - try: - pieces = from_vcs_f(cfg.tag_prefix, root, verbose) - ver = render(pieces, cfg.style) - if verbose: - print("got version from VCS %s" % ver) - return ver - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - ver = versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - if verbose: - print("got version from parentdir %s" % ver) - return ver - except NotThisMethod: - pass - - if verbose: - print("unable to compute version") - - return { - "version": "0+unknown", - "full-revisionid": None, - "dirty": None, - "error": "unable to compute version", - "date": None, - } - - -def get_version(): - """Get the short version string for this project.""" - return get_versions()["version"] - - -def get_cmdclass(): - """Get the custom setuptools/distutils subclasses used by Versioneer.""" - if "versioneer" in sys.modules: - del sys.modules["versioneer"] - # this fixes the "python setup.py develop" case (also 'install' and - # 'easy_install .'), in which subdependencies of the main project are - # built (using setup.py bdist_egg) in the same python process. Assume - # a main project A and a dependency B, which use different versions - # of Versioneer. A's setup.py imports A's Versioneer, leaving it in - # sys.modules by the time B's setup.py is executed, causing B to run - # with the wrong versioneer. Setuptools wraps the sub-dep builds in a - # sandbox that restores sys.modules to it's pre-build state, so the - # parent is protected against the child's "import versioneer". By - # removing ourselves from sys.modules here, before the child build - # happens, we protect the child from the parent's versioneer too. - # Also see https://github.com/warner/python-versioneer/issues/52 - - cmds = {} - - # we add "version" to both distutils and setuptools - from distutils.core import Command - - class cmd_version(Command): - description = "report generated version string" - user_options = [] - boolean_options = [] - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - vers = get_versions(verbose=True) - print("Version: %s" % vers["version"]) - print(" full-revisionid: %s" % vers.get("full-revisionid")) - print(" dirty: %s" % vers.get("dirty")) - print(" date: %s" % vers.get("date")) - if vers["error"]: - print(" error: %s" % vers["error"]) - - cmds["version"] = cmd_version - - # we override "build_py" in both distutils and setuptools - # - # most invocation pathways end up running build_py: - # distutils/build -> build_py - # distutils/install -> distutils/build ->.. - # setuptools/bdist_wheel -> distutils/install ->.. - # setuptools/bdist_egg -> distutils/install_lib -> build_py - # setuptools/install -> bdist_egg ->.. - # setuptools/develop -> ? - # pip install: - # copies source tree to a tempdir before running egg_info/etc - # if .git isn't copied too, 'git describe' will fail - # then does setup.py bdist_wheel, or sometimes setup.py install - # setup.py egg_info -> ? - - # we override different "build_py" commands for both environments - if "setuptools" in sys.modules: - from setuptools.command.build_py import build_py as _build_py - else: - from distutils.command.build_py import build_py as _build_py - - class cmd_build_py(_build_py): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - _build_py.run(self) - # now locate _version.py in the new build/ directory and replace - # it with an updated value - if cfg.versionfile_build: - target_versionfile = os.path.join( - self.build_lib, cfg.versionfile_build - ) - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - - cmds["build_py"] = cmd_build_py - - if "cx_Freeze" in sys.modules: # cx_freeze enabled? - from cx_Freeze.dist import build_exe as _build_exe - - # nczeczulin reports that py2exe won't like the pep440-style string - # as FILEVERSION, but it can be used for PRODUCTVERSION, e.g. - # setup(console=[{ - # "version": versioneer.get_version().split("+", 1)[0], # FILEVERSION - # "product_version": versioneer.get_version(), - # ... - - class cmd_build_exe(_build_exe): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - target_versionfile = cfg.versionfile_source - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - - _build_exe.run(self) - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write( - LONG - % { - "DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - } - ) - - cmds["build_exe"] = cmd_build_exe - del cmds["build_py"] - - if "py2exe" in sys.modules: # py2exe enabled? - try: - from py2exe.distutils_buildexe import py2exe as _py2exe # py3 - except ImportError: - from py2exe.build_exe import py2exe as _py2exe # py2 - - class cmd_py2exe(_py2exe): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - target_versionfile = cfg.versionfile_source - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - - _py2exe.run(self) - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write( - LONG - % { - "DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - } - ) - - cmds["py2exe"] = cmd_py2exe - - # we override different "sdist" commands for both environments - if "setuptools" in sys.modules: - from setuptools.command.sdist import sdist as _sdist - else: - from distutils.command.sdist import sdist as _sdist - - class cmd_sdist(_sdist): - def run(self): - versions = get_versions() - self._versioneer_generated_versions = versions - # unless we update this, the command will keep using the old - # version - self.distribution.metadata.version = versions["version"] - return _sdist.run(self) - - def make_release_tree(self, base_dir, files): - root = get_root() - cfg = get_config_from_root(root) - _sdist.make_release_tree(self, base_dir, files) - # now locate _version.py in the new base_dir directory - # (remembering that it may be a hardlink) and replace it with an - # updated value - target_versionfile = os.path.join(base_dir, cfg.versionfile_source) - print("UPDATING %s" % target_versionfile) - write_to_version_file( - target_versionfile, self._versioneer_generated_versions - ) - - cmds["sdist"] = cmd_sdist - - return cmds - - -CONFIG_ERROR = """ -setup.cfg is missing the necessary Versioneer configuration. You need -a section like: - - [versioneer] - VCS = git - style = pep440 - versionfile_source = src/myproject/_version.py - versionfile_build = myproject/_version.py - tag_prefix = - parentdir_prefix = myproject- - -You will also need to edit your setup.py to use the results: - - import versioneer - setup(version=versioneer.get_version(), - cmdclass=versioneer.get_cmdclass(), ...) - -Please read the docstring in ./versioneer.py for configuration instructions, -edit setup.cfg, and re-run the installer or 'python versioneer.py setup'. -""" - -SAMPLE_CONFIG = """ -# See the docstring in versioneer.py for instructions. Note that you must -# re-run 'versioneer.py setup' after changing this section, and commit the -# resulting files. - -[versioneer] -#VCS = git -#style = pep440 -#versionfile_source = -#versionfile_build = -#tag_prefix = -#parentdir_prefix = - -""" - -INIT_PY_SNIPPET = """ -from ._version import get_versions -__version__ = get_versions()['version'] -del get_versions -""" - - -def do_setup(): - """Main VCS-independent setup function for installing Versioneer.""" - root = get_root() - try: - cfg = get_config_from_root(root) - except ( - EnvironmentError, - configparser.NoSectionError, - configparser.NoOptionError, - ) as e: - if isinstance(e, (EnvironmentError, configparser.NoSectionError)): - print( - "Adding sample versioneer config to setup.cfg", file=sys.stderr - ) - with open(os.path.join(root, "setup.cfg"), "a") as f: - f.write(SAMPLE_CONFIG) - print(CONFIG_ERROR, file=sys.stderr) - return 1 - - print(" creating %s" % cfg.versionfile_source) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write( - LONG - % { - "DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - } - ) - - ipy = os.path.join(os.path.dirname(cfg.versionfile_source), "__init__.py") - if os.path.exists(ipy): - try: - with open(ipy, "r") as f: - old = f.read() - except EnvironmentError: - old = "" - if INIT_PY_SNIPPET not in old: - print(" appending to %s" % ipy) - with open(ipy, "a") as f: - f.write(INIT_PY_SNIPPET) - else: - print(" %s unmodified" % ipy) - else: - print(" %s doesn't exist, ok" % ipy) - ipy = None - - # Make sure both the top-level "versioneer.py" and versionfile_source - # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so - # they'll be copied into source distributions. Pip won't be able to - # install the package without this. - manifest_in = os.path.join(root, "MANIFEST.in") - simple_includes = set() - try: - with open(manifest_in, "r") as f: - for line in f: - if line.startswith("include "): - for include in line.split()[1:]: - simple_includes.add(include) - except EnvironmentError: - pass - # That doesn't cover everything MANIFEST.in can do - # (http://docs.python.org/2/distutils/sourcedist.html#commands), so - # it might give some false negatives. Appending redundant 'include' - # lines is safe, though. - if "versioneer.py" not in simple_includes: - print(" appending 'versioneer.py' to MANIFEST.in") - with open(manifest_in, "a") as f: - f.write("include versioneer.py\n") - else: - print(" 'versioneer.py' already in MANIFEST.in") - if cfg.versionfile_source not in simple_includes: - print( - " appending versionfile_source ('%s') to MANIFEST.in" - % cfg.versionfile_source - ) - with open(manifest_in, "a") as f: - f.write("include %s\n" % cfg.versionfile_source) - else: - print(" versionfile_source already in MANIFEST.in") - - # Make VCS-specific changes. For git, this means creating/changing - # .gitattributes to mark _version.py for export-subst keyword - # substitution. - do_vcs_install(manifest_in, cfg.versionfile_source, ipy) - return 0 - - -def scan_setup_py(): - """Validate the contents of setup.py against Versioneer's expectations.""" - found = set() - setters = False - errors = 0 - with open("setup.py", "r") as f: - for line in f.readlines(): - if "import versioneer" in line: - found.add("import") - if "versioneer.get_cmdclass()" in line: - found.add("cmdclass") - if "versioneer.get_version()" in line: - found.add("get_version") - if "versioneer.VCS" in line: - setters = True - if "versioneer.versionfile_source" in line: - setters = True - if len(found) != 3: - print("") - print("Your setup.py appears to be missing some important items") - print("(but I might be wrong). Please make sure it has something") - print("roughly like the following:") - print("") - print(" import versioneer") - print(" setup( version=versioneer.get_version(),") - print(" cmdclass=versioneer.get_cmdclass(), ...)") - print("") - errors += 1 - if setters: - print("You should remove lines like 'versioneer.VCS = ' and") - print("'versioneer.versionfile_source = ' . This configuration") - print("now lives in setup.cfg, and should be removed from setup.py") - print("") - errors += 1 - return errors - - -if __name__ == "__main__": - cmd = sys.argv[1] - if cmd == "setup": - errors = do_setup() - errors += scan_setup_py() - if errors: - sys.exit(1) From 2a13105f1500e068f3bcfe6af8e76074b609371a Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 30 Jun 2023 11:07:14 -0700 Subject: [PATCH 03/56] add gha to build, publish and test wheels --- .github/workflows/build.yaml | 20 ++++++++++++++++++++ .github/workflows/pr.yaml | 19 +++++++++++++++++++ .github/workflows/test.yaml | 8 ++++++++ ci/release/wheel_smoke_test.py | 4 ++++ 4 files changed, 51 insertions(+) create mode 100644 ci/release/wheel_smoke_test.py diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8871345e..00aef38e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -57,3 +57,23 @@ jobs: node_type: "gpu-v100-latest-1" run_script: "ci/build_docs.sh" sha: ${{ inputs.sha }} + wheel-build: + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.08 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + sha: ${{ inputs.sha }} + date: ${{ inputs.date }} + package-name: cudf + package-dir: python/cuxfilter + wheel-publish: + needs: wheel-build + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@branch-23.08 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + sha: ${{ inputs.sha }} + date: ${{ inputs.date }} + package-name: cuxfilter diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 6052ec7b..c6fd86ad 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -17,6 +17,8 @@ jobs: - conda-python-tests - conda-notebook-tests - docs-build + - wheel-build + - wheel-tests secrets: inherit uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@cuda-120 checks: @@ -55,3 +57,20 @@ jobs: arch: "amd64" container_image: "rapidsai/ci:latest" run_script: "ci/build_docs.sh" + wheel-build: + needs: checks + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.08 + with: + build_type: pull-request + package-name: cuxfilter + package-dir: python + wheel-tests: + needs: wheel-build + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.08 + with: + build_type: pull-request + package-name: cuxfilter + test-unittest: "python -m pytest -n 8 ./python/cuxfilter/tests" + test-smoketest: "python ./ci/wheel_smoke_test.py" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c4ad5f46..73787591 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -22,3 +22,11 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} + wheel-tests: + needs: wheel-build + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.08 + with: + build_type: pull-request + package-name: cuxfilter + test-unittest: "python -m pytest -n 8 ./python/cuxfilter/tests" diff --git a/ci/release/wheel_smoke_test.py b/ci/release/wheel_smoke_test.py new file mode 100644 index 00000000..225de7bd --- /dev/null +++ b/ci/release/wheel_smoke_test.py @@ -0,0 +1,4 @@ +import cuxfilter + +if __name__ == '__main__': + assert cuxfilter.__version__ is not None \ No newline at end of file From 9736d1708ad1203908bd79d6ea721ec93a9375fb Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 30 Jun 2023 11:10:52 -0700 Subject: [PATCH 04/56] add new line at the end --- .flake8 | 2 +- ci/release/wheel_smoke_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.flake8 b/.flake8 index 0c711576..0494ee99 100644 --- a/.flake8 +++ b/.flake8 @@ -8,4 +8,4 @@ ignore = # line break before binary operator W503, # whitespace before : - E203 \ No newline at end of file + E203 diff --git a/ci/release/wheel_smoke_test.py b/ci/release/wheel_smoke_test.py index 225de7bd..29840ec4 100644 --- a/ci/release/wheel_smoke_test.py +++ b/ci/release/wheel_smoke_test.py @@ -1,4 +1,4 @@ import cuxfilter if __name__ == '__main__': - assert cuxfilter.__version__ is not None \ No newline at end of file + assert cuxfilter.__version__ is not None From 595082fbe84d4efbfdb66672d532d3a80ffa4869 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 30 Jun 2023 11:33:07 -0700 Subject: [PATCH 05/56] add apply_wheel_modifications script --- ci/release/apply_wheel_modifications.sh | 22 ++++++++++++++++++++++ ci/{release => utils}/wheel_smoke_test.py | 0 2 files changed, 22 insertions(+) create mode 100755 ci/release/apply_wheel_modifications.sh rename ci/{release => utils}/wheel_smoke_test.py (100%) diff --git a/ci/release/apply_wheel_modifications.sh b/ci/release/apply_wheel_modifications.sh new file mode 100755 index 00000000..506009c2 --- /dev/null +++ b/ci/release/apply_wheel_modifications.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Copyright (c) 2023, NVIDIA CORPORATION. +# +# Usage: bash apply_wheel_modifications.sh + +VERSION=${1} +CUDA_SUFFIX=${2} + +# pyproject.toml versions +sed -i "s/^version = .*/version = \"${VERSION}\"/g" python/cuxfilter/pyproject.toml + +# cuxfilter pyproject.toml cuda suffixes +sed -i "s/^name = \"cuxfilter\"/name = \"cuxfilter${CUDA_SUFFIX}\"/g" python/cuxfilter/pyproject.toml +# Need to provide the == to avoid modifying the URL +sed -i "s/\"cudf==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml +sed -i "s/\"cuspatial==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml +sed -i "s/\"dask-cuda==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml +sed -i "s/\"dask-cudf==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml + +if [[ $CUDA_SUFFIX == "-cu12" ]]; then + sed -i "s/numba[<=>\.,0-9]*/numba>=0.57/g" python/cuxfilter/pyproject.toml +fi \ No newline at end of file diff --git a/ci/release/wheel_smoke_test.py b/ci/utils/wheel_smoke_test.py similarity index 100% rename from ci/release/wheel_smoke_test.py rename to ci/utils/wheel_smoke_test.py From 10dcf41757c6e9960acfc126a34c1701d9e13149 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 30 Jun 2023 11:46:33 -0700 Subject: [PATCH 06/56] rm README file --- python/README.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 python/README.md diff --git a/python/README.md b/python/README.md deleted file mode 100644 index 7376206b..00000000 --- a/python/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# cuxfilter.py - -Python library to do server-side cross-filtering viz dashboards using cudf, panel & bokeh. \ No newline at end of file From 964ebbd9c0318141eedcd12b556e1f0c2f50dc97 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 30 Jun 2023 11:47:24 -0700 Subject: [PATCH 07/56] Add symbolic link to README file to fix pyproject.toml referencing a README.md that does not exist --- python/README.md | 1 + 1 file changed, 1 insertion(+) create mode 120000 python/README.md diff --git a/python/README.md b/python/README.md new file mode 120000 index 00000000..32d46ee8 --- /dev/null +++ b/python/README.md @@ -0,0 +1 @@ +../README.md \ No newline at end of file From 1198848a3f5f9d14d370c87c2b774013203e2281 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 30 Jun 2023 11:59:08 -0700 Subject: [PATCH 08/56] fix typo --- python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index 3d91fac1..95fa9044 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -8,7 +8,7 @@ requires = [] name = "cuxfilter" version = "23.08.00" description = "GPU accelerated cross filtering with cuDF" -readme = { file = "README.md", content_type = "text/markdown" } +readme = { file = "README.md", content-type = "text/markdown" } authors = [ {name = "NVIDIA Corporation"}, ] From b315075fca7353d5c66c4827e52a469f8bac2fd3 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 10:08:44 -0700 Subject: [PATCH 09/56] Update .pre-commit-config.yaml Co-authored-by: AJ Schmidt --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 58b406de..af7e646b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: types_or: [python, cython] additional_dependencies: ["flake8-force"] - repo: https://github.com/rapidsai/dependency-file-generator - rev: v1.5.1 + rev: v1.5.2 hooks: - id: rapids-dependency-file-generator args: ["--clean"] From 49d3c88df522a893a798f816b112ca9ffef87416 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 10:59:43 -0700 Subject: [PATCH 10/56] update to cuda12 --- .github/workflows/build.yaml | 4 ++-- .github/workflows/pr.yaml | 4 ++-- .github/workflows/test.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 00aef38e..414c13c9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -59,7 +59,7 @@ jobs: sha: ${{ inputs.sha }} wheel-build: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-120 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -70,7 +70,7 @@ jobs: wheel-publish: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@cuda-120 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c6fd86ad..2a0ee13a 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -60,7 +60,7 @@ jobs: wheel-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-120 with: build_type: pull-request package-name: cuxfilter @@ -68,7 +68,7 @@ jobs: wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-120 with: build_type: pull-request package-name: cuxfilter diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 73787591..dfd8a80b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -25,7 +25,7 @@ jobs: wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-120 with: build_type: pull-request package-name: cuxfilter From 9690c3f6906a0e1aee0c07b278bef2c35ae7b0c8 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 11:10:31 -0700 Subject: [PATCH 11/56] fix pyproject.toml path --- ci/release/apply_wheel_modifications.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ci/release/apply_wheel_modifications.sh b/ci/release/apply_wheel_modifications.sh index 506009c2..fa4b6a4a 100755 --- a/ci/release/apply_wheel_modifications.sh +++ b/ci/release/apply_wheel_modifications.sh @@ -7,16 +7,17 @@ VERSION=${1} CUDA_SUFFIX=${2} # pyproject.toml versions -sed -i "s/^version = .*/version = \"${VERSION}\"/g" python/cuxfilter/pyproject.toml +sed -i "s/^version = .*/version = \"${VERSION}\"/g" python/pyproject.toml # cuxfilter pyproject.toml cuda suffixes -sed -i "s/^name = \"cuxfilter\"/name = \"cuxfilter${CUDA_SUFFIX}\"/g" python/cuxfilter/pyproject.toml +sed -i "s/^name = \"cuxfilter\"/name = \"cuxfilter${CUDA_SUFFIX}\"/g" python/pyproject.toml # Need to provide the == to avoid modifying the URL -sed -i "s/\"cudf==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml -sed -i "s/\"cuspatial==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml -sed -i "s/\"dask-cuda==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml -sed -i "s/\"dask-cudf==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml +sed -i "s/\"cudf==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml +sed -i "s/\"cuspatial==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml +sed -i "s/\"dask-cuda==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml +sed -i "s/\"dask-cudf==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml if [[ $CUDA_SUFFIX == "-cu12" ]]; then - sed -i "s/numba[<=>\.,0-9]*/numba>=0.57/g" python/cuxfilter/pyproject.toml + sed -i "s/numba[<=>\.,0-9]*/numba>=0.57/g" python/pyproject.toml + sed -i "s/cuda-python[<=>\.,0-9]*/cuda-python>=12.0,<13.0/g" python/pyproject.toml fi \ No newline at end of file From 6e92fa8ab4f927f05f80ed82509c820b501dae50 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 12:12:42 -0700 Subject: [PATCH 12/56] update dependencies.yaml to include pyproject.toml --- dependencies.yaml | 35 ++++++++++++++++++++++++++++++++--- python/pyproject.toml | 32 +++++++++++++++++++++++++++++--- 2 files changed, 61 insertions(+), 6 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index b6c79700..238cf3f0 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -6,6 +6,7 @@ files: cuda: ["11.8", "12.0"] arch: [x86_64] includes: + - build_wheels - cudatoolkit - checks - docs @@ -35,12 +36,40 @@ files: - cudatoolkit - docs - py_version + py_build: + output: pyproject + pyproject_dir: python + extras: + table: build-system + includes: + - build_wheels + py_run: + output: pyproject + pyproject_dir: python + extras: + table: project + includes: + - run + py_test: + output: pyproject + pyproject_dir: python + extras: + table: project.optional-dependencies + key: test + includes: + - test_python channels: - rapidsai - rapidsai-nightly - conda-forge - nvidia dependencies: + build_wheels: + common: + - output_types: pyproject + packages: + - wheel + - setuptools cudatoolkit: specific: - output_types: conda @@ -114,7 +143,7 @@ dependencies: - python>=3.9,<3.11 run: common: - - output_types: [conda, requirements] + - output_types: [conda, requirements, pyproject] packages: - bokeh>=2.4.2,<=2.5 - cudf=23.08.* @@ -134,7 +163,7 @@ dependencies: - pydeck>=0.3,<=0.5.0 - pyppeteer>=0.2.6 - pyproj>=2.4,<=3.4 - - output_types: conda + - output_types: [conda, pyproject] packages: - cupy>=12.0.0 - output_types: requirements @@ -142,7 +171,7 @@ dependencies: - cupy-cuda11x>=12.0.0 test_python: common: - - output_types: [conda, requirements] + - output_types: [conda, requirements, pyproject] packages: - pytest - pytest-cov diff --git a/python/pyproject.toml b/python/pyproject.toml index 95fa9044..f778d1d8 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -2,7 +2,10 @@ [build-system] build-backend = "setuptools.build_meta" -requires = [] +requires = [ + "setuptools", + "wheel", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`. [project] name = "cuxfilter" @@ -14,7 +17,27 @@ authors = [ ] license = { text = "Apache 2.0" } requires-python = ">=3.9" -dependencies = [] +dependencies = [ + "bokeh>=2.4.2,<=2.5", + "cudf=23.08.*", + "cupy>=12.0.0", + "cuspatial=23.08.*", + "dask-cuda=23.08.*", + "dask-cudf=23.08.*", + "datashader>=0.15", + "geopandas>=0.11.0", + "holoviews>=1.15.0,<=1.15.4", + "jupyter-server-proxy", + "libwebp", + "nodejs>=14", + "numba>=0.57", + "numpy>=1.21", + "packaging", + "panel >=0.14.0,<=0.14.1", + "pydeck>=0.3,<=0.5.0", + "pyppeteer>=0.2.6", + "pyproj>=2.4,<=3.4", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers", "Topic :: Database", @@ -26,7 +49,10 @@ classifiers = [ ] [project.optional-dependencies] -test = [] +test = [ + "pytest", + "pytest-cov", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`. [project.urls] Homepage = "https://github.com/rapidsai/cuxfilter" From 167ea9b9a79c8c42263f199cf357eda676e26c85 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 12:26:45 -0700 Subject: [PATCH 13/56] version conditions in pep508 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 10 +++++----- conda/environments/all_cuda-120_arch-x86_64.yaml | 12 ++++++------ dependencies.yaml | 10 +++++----- python/pyproject.toml | 10 +++++----- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 85e69634..0242511c 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -9,12 +9,12 @@ dependencies: - bokeh>=2.4.2,<=2.5 - cuda-version=11.8 - cudatoolkit -- cudf=23.08.* -- cugraph=23.08.* +- cudf==23.08.* +- cugraph==23.08.* - cupy>=12.0.0 -- cuspatial=23.08.* -- dask-cuda=23.08.* -- dask-cudf=23.08.* +- cuspatial==23.08.* +- dask-cuda==23.08.* +- dask-cudf==23.08.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index 254301df..dbaf8ee1 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -8,12 +8,12 @@ channels: dependencies: - bokeh>=2.4.2,<=2.5 - cuda-version=12.0 -- cudf=23.08.* -- cugraph=23.08.* +- cudf==23.08.* +- cugraph==23.08.* - cupy>=12.0.0 -- cuspatial=23.08.* -- dask-cuda=23.08.* -- dask-cudf=23.08.* +- cuspatial==23.08.* +- dask-cuda==23.08.* +- dask-cudf==23.08.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 @@ -29,7 +29,7 @@ dependencies: - numpydoc - packaging - pandoc<=2.0.0 -- panel >=0.14.0,<=0.14.1 +- panel>=0.14.0,<=0.14.1 - pre-commit - pydeck>=0.3,<=0.5.0 - pyppeteer>=0.2.6 diff --git a/dependencies.yaml b/dependencies.yaml index 238cf3f0..c8ad45c9 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -125,7 +125,7 @@ dependencies: - notebook>=0.5.0 - output_types: [conda] packages: - - cugraph=23.08.* + - cugraph==23.08.* py_version: specific: - output_types: conda @@ -146,10 +146,10 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - bokeh>=2.4.2,<=2.5 - - cudf=23.08.* - - cuspatial=23.08.* - - dask-cuda=23.08.* - - dask-cudf=23.08.* + - cudf==23.08.* + - cuspatial==23.08.* + - dask-cuda==23.08.* + - dask-cudf==23.08.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 diff --git a/python/pyproject.toml b/python/pyproject.toml index f778d1d8..5726159e 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -19,11 +19,11 @@ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ "bokeh>=2.4.2,<=2.5", - "cudf=23.08.*", + "cudf==23.08.*", "cupy>=12.0.0", - "cuspatial=23.08.*", - "dask-cuda=23.08.*", - "dask-cudf=23.08.*", + "cuspatial==23.08.*", + "dask-cuda==23.08.*", + "dask-cudf==23.08.*", "datashader>=0.15", "geopandas>=0.11.0", "holoviews>=1.15.0,<=1.15.4", @@ -33,7 +33,7 @@ dependencies = [ "numba>=0.57", "numpy>=1.21", "packaging", - "panel >=0.14.0,<=0.14.1", + "panel>=0.14.0,<=0.14.1", "pydeck>=0.3,<=0.5.0", "pyppeteer>=0.2.6", "pyproj>=2.4,<=3.4", From ebe0d1e5f1b22d9cf89f6ff51b47ec41f138a493 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 12:57:42 -0700 Subject: [PATCH 14/56] rm manifest and _version --- python/MANIFEST.in | 2 - python/cuxfilter/_version.py | 566 ----------------------------------- 2 files changed, 568 deletions(-) delete mode 100644 python/MANIFEST.in delete mode 100644 python/cuxfilter/_version.py diff --git a/python/MANIFEST.in b/python/MANIFEST.in deleted file mode 100644 index 5d82efee..00000000 --- a/python/MANIFEST.in +++ /dev/null @@ -1,2 +0,0 @@ -include versioneer.py -include cuxfilter/_version.py diff --git a/python/cuxfilter/_version.py b/python/cuxfilter/_version.py deleted file mode 100644 index 50d01a62..00000000 --- a/python/cuxfilter/_version.py +++ /dev/null @@ -1,566 +0,0 @@ -# This file helps to compute a version number in source trees obtained from -# git-archive tarball (such as those provided by githubs download-from-tag -# feature). Distribution tarballs (built by setup.py sdist) and build -# directories (produced by setup.py build) will contain a much shorter file -# that just contains the computed version number. - -# This file is released into the public domain. Generated by -# versioneer-0.18 (https://github.com/warner/python-versioneer) - -"""Git implementation of _version.py.""" - -import errno -import os -import re -import subprocess -import sys - - -def get_keywords(): - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must - # each be defined on a line of their own. _version.py will just call - # get_keywords(). - git_refnames = "$Format:%d$" - git_full = "$Format:%H$" - git_date = "$Format:%ci$" - keywords = {"refnames": git_refnames, "full": git_full, "date": git_date} - return keywords - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_config(): - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py - cfg = VersioneerConfig() - cfg.VCS = "git" - cfg.style = "pep440" - cfg.tag_prefix = "v" - cfg.parentdir_prefix = "cuxfilter-" - cfg.versionfile_source = "cuxfilter/_version.py" - cfg.verbose = False - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - - return decorate - - -def run_command( - commands, args, cwd=None, verbose=False, hide_stderr=False, env=None -): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen( - [c] + args, - cwd=cwd, - env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr else None), - ) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %s" % dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %s" % (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) - return None, p.returncode - return stdout, p.returncode - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return { - "version": dirname[len(parentdir_prefix) :], - "full-revisionid": None, - "dirty": False, - "error": None, - "date": None, - } - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print( - "Tried directories %s but none started with prefix %s" - % (str(rootdirs), parentdir_prefix) - ) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG) :] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r"\d", r)]) - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: - print("likely tags: %s" % ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix) :] - if verbose: - print("picking %s" % r) - return { - "version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, - "error": None, - "date": date, - } - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return { - "version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, - "error": "no suitable tags", - "date": None, - } - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command( - GITS, ["rev-parse", "--git-dir"], cwd=root, hide_stderr=True - ) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command( - GITS, - [ - "describe", - "--tags", - "--dirty", - "--always", - "--long", - "--match", - "%s*" % tag_prefix, - ], - cwd=root, - ) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[: git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ( - "unable to parse git-describe output: '%s'" % describe_out - ) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) - pieces["error"] = "tag '%s' doesn't start with prefix '%s'" % ( - full_tag, - tag_prefix, - ) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix) :] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command( - GITS, ["rev-list", "HEAD", "--count"], cwd=root - ) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], cwd=root)[ - 0 - ].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%d" % pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%d" % pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%s" % pieces["short"] - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%s" % pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return { - "version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None, - } - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%s'" % style) - - return { - "version": rendered, - "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], - "error": None, - "date": pieces.get("date"), - } - - -def get_versions(): - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some - # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which - # case we can only use expanded keywords. - - cfg = get_config() - verbose = cfg.verbose - - try: - return git_versions_from_keywords( - get_keywords(), cfg.tag_prefix, verbose - ) - except NotThisMethod: - pass - - try: - root = os.path.realpath(__file__) - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. - for i in cfg.versionfile_source.split("/"): - root = os.path.dirname(root) - except NameError: - return { - "version": "0+unknown", - "full-revisionid": None, - "dirty": None, - "error": "unable to find root of source tree", - "date": None, - } - - try: - pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose) - return render(pieces, cfg.style) - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - return versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - except NotThisMethod: - pass - - return { - "version": "0+unknown", - "full-revisionid": None, - "dirty": None, - "error": "unable to compute version", - "date": None, - } From 3c794bf41a4d4737bf6659181a7cabacbb1852cf Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 13:01:12 -0700 Subject: [PATCH 15/56] fix versions --- ci/release/update-version.sh | 3 +++ python/cuxfilter/__init__.py | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index acb1ac9d..4710d4e8 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -37,6 +37,9 @@ function sed_runner() { sed_runner 's/version = .*/version = '"'${NEXT_SHORT_TAG}'"'/g' docs/source/conf.py sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/source/conf.py +# Python __init__.py updates +sed_runner "s/__version__ = .*/__version__ = \"${NEXT_FULL_TAG}\"/g" python/cuxfilter/__init__.py + DEPENDENCIES=( cudf dask-cuda diff --git a/python/cuxfilter/__init__.py b/python/cuxfilter/__init__.py index f91290c8..09604267 100644 --- a/python/cuxfilter/__init__.py +++ b/python/cuxfilter/__init__.py @@ -1,6 +1,4 @@ from cuxfilter.dataframe import DataFrame from cuxfilter.dashboard import DashBoard -from ._version import get_versions -__version__ = get_versions()["version"] -del get_versions +__version__ = "23.08.00" \ No newline at end of file From f975324a62afefc047f5bcb7126cc02f77447b56 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 13:04:23 -0700 Subject: [PATCH 16/56] add newline at end --- python/cuxfilter/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cuxfilter/__init__.py b/python/cuxfilter/__init__.py index 09604267..5f1444aa 100644 --- a/python/cuxfilter/__init__.py +++ b/python/cuxfilter/__init__.py @@ -1,4 +1,4 @@ from cuxfilter.dataframe import DataFrame from cuxfilter.dashboard import DashBoard -__version__ = "23.08.00" \ No newline at end of file +__version__ = "23.08.00" From 8194361050eec12c1160bbab2b6da77cf06f22d6 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 10:47:13 -0700 Subject: [PATCH 17/56] fix dependencies --- dependencies.yaml | 7 +++++-- python/pyproject.toml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index c8ad45c9..429d4959 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -163,12 +163,15 @@ dependencies: - pydeck>=0.3,<=0.5.0 - pyppeteer>=0.2.6 - pyproj>=2.4,<=3.4 - - output_types: [conda, pyproject] + - output_types: conda packages: - cupy>=12.0.0 - output_types: requirements packages: - - cupy-cuda11x>=12.0.0 + - &cupy_pip cupy-cuda11x>=12.0.0 + - output_types: pyproject + packages: + - *cupy_pip test_python: common: - output_types: [conda, requirements, pyproject] diff --git a/python/pyproject.toml b/python/pyproject.toml index 5726159e..f6852a6d 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -20,7 +20,7 @@ requires-python = ">=3.9" dependencies = [ "bokeh>=2.4.2,<=2.5", "cudf==23.08.*", - "cupy>=12.0.0", + "cupy-cuda11x>=12.0.0", "cuspatial==23.08.*", "dask-cuda==23.08.*", "dask-cudf==23.08.*", From 91f258e80fae9c4569f103504fcecebbd50345f9 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 10:47:50 -0700 Subject: [PATCH 18/56] wheels for CUDA 12 use cupy-cuda12x --- ci/release/apply_wheel_modifications.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/apply_wheel_modifications.sh b/ci/release/apply_wheel_modifications.sh index fa4b6a4a..2443a242 100755 --- a/ci/release/apply_wheel_modifications.sh +++ b/ci/release/apply_wheel_modifications.sh @@ -19,5 +19,5 @@ sed -i "s/\"dask-cudf==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml if [[ $CUDA_SUFFIX == "-cu12" ]]; then sed -i "s/numba[<=>\.,0-9]*/numba>=0.57/g" python/pyproject.toml - sed -i "s/cuda-python[<=>\.,0-9]*/cuda-python>=12.0,<13.0/g" python/pyproject.toml + sed -i "s/cupy-cuda11x/cupy-cuda12x/g" python/pyproject.toml fi \ No newline at end of file From 582b4169a383eb951ff8942e366d1c47ea29b4ea Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 10:50:20 -0700 Subject: [PATCH 19/56] fix modification scripts for typos --- ci/release/apply_wheel_modifications.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/release/apply_wheel_modifications.sh b/ci/release/apply_wheel_modifications.sh index 2443a242..4e29540c 100755 --- a/ci/release/apply_wheel_modifications.sh +++ b/ci/release/apply_wheel_modifications.sh @@ -13,9 +13,9 @@ sed -i "s/^version = .*/version = \"${VERSION}\"/g" python/pyproject.toml sed -i "s/^name = \"cuxfilter\"/name = \"cuxfilter${CUDA_SUFFIX}\"/g" python/pyproject.toml # Need to provide the == to avoid modifying the URL sed -i "s/\"cudf==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml -sed -i "s/\"cuspatial==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml -sed -i "s/\"dask-cuda==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml -sed -i "s/\"dask-cudf==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml +sed -i "s/\"cuspatial==/\"cuspatial${CUDA_SUFFIX}==/g" python/pyproject.toml +sed -i "s/\"dask-cuda==/\"dask-cuda${CUDA_SUFFIX}==/g" python/pyproject.toml +sed -i "s/\"dask-cudf==/\"dask-cudf${CUDA_SUFFIX}==/g" python/pyproject.toml if [[ $CUDA_SUFFIX == "-cu12" ]]; then sed -i "s/numba[<=>\.,0-9]*/numba>=0.57/g" python/pyproject.toml From e6fa115bf59be81f8234d4779ee772dcbf96ee81 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 11:01:33 -0700 Subject: [PATCH 20/56] Merge branch 'branch-23.08' of github.com:rapidsai/cuxfilter into add-pip-wheels --- conda/environments/all_cuda-118_arch-x86_64.yaml | 10 +++++----- conda/environments/all_cuda-120_arch-x86_64.yaml | 10 +++++----- conda/recipes/cuxfilter/meta.yaml | 1 + dependencies.yaml | 10 +++++----- python/pyproject.toml | 8 ++++---- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 0242511c..ffc271c9 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -9,12 +9,12 @@ dependencies: - bokeh>=2.4.2,<=2.5 - cuda-version=11.8 - cudatoolkit -- cudf==23.08.* -- cugraph==23.08.* +- cudf==23.8.* +- cugraph==23.8.* - cupy>=12.0.0 -- cuspatial==23.08.* -- dask-cuda==23.08.* -- dask-cudf==23.08.* +- cuspatial==23.8.* +- dask-cuda==23.8.* +- dask-cudf==23.8.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index dbaf8ee1..89bc099c 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -8,12 +8,12 @@ channels: dependencies: - bokeh>=2.4.2,<=2.5 - cuda-version=12.0 -- cudf==23.08.* -- cugraph==23.08.* +- cudf==23.8.* +- cugraph==23.8.* - cupy>=12.0.0 -- cuspatial==23.08.* -- dask-cuda==23.08.* -- dask-cudf==23.08.* +- cuspatial==23.8.* +- dask-cuda==23.8.* +- dask-cudf==23.8.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml index 948c447a..2c3035f2 100644 --- a/conda/recipes/cuxfilter/meta.yaml +++ b/conda/recipes/cuxfilter/meta.yaml @@ -1,6 +1,7 @@ # Copyright (c) 2018-2023, NVIDIA CORPORATION. {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %} +{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %} {% set cuda_major = cuda_version.split('.')[0] %} {% set py_version = environ['CONDA_PY'] %} diff --git a/dependencies.yaml b/dependencies.yaml index 429d4959..ddc4ada3 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -125,7 +125,7 @@ dependencies: - notebook>=0.5.0 - output_types: [conda] packages: - - cugraph==23.08.* + - cugraph==23.8.* py_version: specific: - output_types: conda @@ -146,10 +146,10 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - bokeh>=2.4.2,<=2.5 - - cudf==23.08.* - - cuspatial==23.08.* - - dask-cuda==23.08.* - - dask-cudf==23.08.* + - cudf==23.8.* + - cuspatial==23.8.* + - dask-cuda==23.8.* + - dask-cudf==23.8.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 diff --git a/python/pyproject.toml b/python/pyproject.toml index f6852a6d..19b1579c 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -19,11 +19,11 @@ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ "bokeh>=2.4.2,<=2.5", - "cudf==23.08.*", + "cudf==23.8.*", "cupy-cuda11x>=12.0.0", - "cuspatial==23.08.*", - "dask-cuda==23.08.*", - "dask-cudf==23.08.*", + "cuspatial==23.8.*", + "dask-cuda==23.8.*", + "dask-cudf==23.8.*", "datashader>=0.15", "geopandas>=0.11.0", "holoviews>=1.15.0,<=1.15.4", From efd2f4f1363c62b8a559cc32814e809638dfd167 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 12:04:22 -0700 Subject: [PATCH 21/56] use wheels-pure workflows for pure python builds --- .github/workflows/build.yaml | 4 ++-- .github/workflows/pr.yaml | 4 ++-- .github/workflows/test.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 414c13c9..c11b8994 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -59,7 +59,7 @@ jobs: sha: ${{ inputs.sha }} wheel-build: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-build.yml@cuda-120 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -70,7 +70,7 @@ jobs: wheel-publish: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-publish.yml@cuda-120 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 2a0ee13a..c98be173 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -60,7 +60,7 @@ jobs: wheel-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-build.yml@cuda-120 with: build_type: pull-request package-name: cuxfilter @@ -68,7 +68,7 @@ jobs: wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-test.yml@cuda-120 with: build_type: pull-request package-name: cuxfilter diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index dfd8a80b..ab4a7908 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -25,7 +25,7 @@ jobs: wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-test.yml@cuda-120 with: build_type: pull-request package-name: cuxfilter From 07ccd5c0db84bf93e71e1da644932bf89e516279 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 12:11:56 -0700 Subject: [PATCH 22/56] remove incorrect input --- .github/workflows/pr.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c98be173..131401b0 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -73,4 +73,3 @@ jobs: build_type: pull-request package-name: cuxfilter test-unittest: "python -m pytest -n 8 ./python/cuxfilter/tests" - test-smoketest: "python ./ci/wheel_smoke_test.py" From 238581af43afeac19dd8e44db079260a80d803ea Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Wed, 5 Jul 2023 13:58:13 -0700 Subject: [PATCH 23/56] update to cuda12 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 10 +++++----- conda/environments/all_cuda-120_arch-x86_64.yaml | 12 ++++++------ conda/recipes/cuxfilter/meta.yaml | 9 ++++----- dependencies.yaml | 10 +++++----- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index d0b2a37d..97e2245a 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -9,12 +9,12 @@ dependencies: - bokeh>=2.4.2,<=2.5 - cuda-version=11.8 - cudatoolkit -- cudf==23.8.* -- cugraph==23.8.* +- cudf=23.08.* +- cugraph=23.08.* - cupy>=12.0.0 -- cuspatial==23.8.* -- dask-cuda==23.8.* -- dask-cudf==23.8.* +- cuspatial=23.08.* +- dask-cuda=23.08.* +- dask-cudf=23.08.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index 7f58f52c..ff789ca7 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -8,12 +8,12 @@ channels: dependencies: - bokeh>=2.4.2,<=2.5 - cuda-version=12.0 -- cudf==23.8.* -- cugraph==23.8.* +- cudf=23.08.* +- cugraph=23.08.* - cupy>=12.0.0 -- cuspatial==23.8.* -- dask-cuda==23.8.* -- dask-cudf==23.8.* +- cuspatial=23.08.* +- dask-cuda=23.08.* +- dask-cudf=23.08.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 @@ -29,7 +29,7 @@ dependencies: - numpydoc - packaging - pandoc<=2.0.0 -- panel>=0.14.0,<=0.14.1 +- panel >=0.14.0,<=0.14.1 - pre-commit - pydata-sphinx-theme - pydeck>=0.3,<=0.5.0 diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml index ba09730a..948c447a 100644 --- a/conda/recipes/cuxfilter/meta.yaml +++ b/conda/recipes/cuxfilter/meta.yaml @@ -1,7 +1,6 @@ # Copyright (c) 2018-2023, NVIDIA CORPORATION. {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %} -{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %} {% set cuda_major = cuda_version.split('.')[0] %} {% set py_version = environ['CONDA_PY'] %} @@ -25,11 +24,11 @@ requirements: - cuda-version ={{ cuda_version }} run: - bokeh >=2.4.2,<=2.5 - - cudf ={{ minor_version }} + - cudf ={{ version }} - cupy >=12.0.0 - - cuspatial ={{ minor_version }} - - dask-cuda ={{ minor_version }} - - dask-cudf ={{ minor_version }} + - cuspatial ={{ version }} + - dask-cuda ={{ version }} + - dask-cudf ={{ version }} - datashader >=0.15 - geopandas >=0.11.0 - holoviews>=1.15.0,<=1.15.4 diff --git a/dependencies.yaml b/dependencies.yaml index 59cb7c41..bf9b2cb6 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -97,7 +97,7 @@ dependencies: - notebook>=0.5.0 - output_types: [conda] packages: - - cugraph==23.8.* + - cugraph=23.08.* py_version: specific: - output_types: conda @@ -118,10 +118,10 @@ dependencies: - output_types: [conda, requirements] packages: - bokeh>=2.4.2,<=2.5 - - cudf==23.8.* - - cuspatial==23.8.* - - dask-cuda==23.8.* - - dask-cudf==23.8.* + - cudf=23.08.* + - cuspatial=23.08.* + - dask-cuda=23.08.* + - dask-cudf=23.08.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 From 7561383853fc11642f35805033971c4007914b15 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 30 Jun 2023 10:50:12 -0700 Subject: [PATCH 24/56] migrate to pyproject.toml --- .flake8 | 11 + .pre-commit-config.yaml | 14 +- python/Makefile | 5 - python/pyproject.toml | 36 + python/record.txt | 125 --- python/setup.cfg | 15 - python/setup.py | 28 +- python/versioneer.py | 1903 --------------------------------------- 8 files changed, 59 insertions(+), 2078 deletions(-) create mode 100644 .flake8 delete mode 100644 python/Makefile create mode 100644 python/pyproject.toml delete mode 100644 python/record.txt delete mode 100644 python/setup.cfg delete mode 100644 python/versioneer.py diff --git a/.flake8 b/.flake8 new file mode 100644 index 00000000..0c711576 --- /dev/null +++ b/.flake8 @@ -0,0 +1,11 @@ +# Copyright (c) 2023, NVIDIA CORPORATION. + +[flake8] +filename = *.py, +exclude = __init__.py, *.egg, build, docs, .git +force-check = True +ignore = + # line break before binary operator + W503, + # whitespace before : + E203 \ No newline at end of file diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3f63b863..58b406de 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,17 +2,25 @@ repos: - repo: https://github.com/psf/black - rev: 22.10.0 + rev: 22.3.0 hooks: - id: black files: python/cuxfilter/.* # Explicitly specify the pyproject.toml at the repo root, not per-project. args: ["--config", "pyproject.toml"] - repo: https://github.com/PyCQA/flake8 - rev: 6.0.0 + rev: 5.0.4 hooks: - id: flake8 - args: ["--config=python/setup.cfg"] + args: ["--config=.flake8"] files: python/.*$ + types: [file] + types_or: [python, cython] + additional_dependencies: ["flake8-force"] + - repo: https://github.com/rapidsai/dependency-file-generator + rev: v1.5.1 + hooks: + - id: rapids-dependency-file-generator + args: ["--clean"] default_language_version: python: python3 diff --git a/python/Makefile b/python/Makefile deleted file mode 100644 index 4c1e63a3..00000000 --- a/python/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -init: - conda env update --file ../conda/environments/cuxfilter_dev_cuda10.0.yml - -test: - nosetests tests diff --git a/python/pyproject.toml b/python/pyproject.toml new file mode 100644 index 00000000..3d91fac1 --- /dev/null +++ b/python/pyproject.toml @@ -0,0 +1,36 @@ +# Copyright (c) 2023, NVIDIA CORPORATION. + +[build-system] +build-backend = "setuptools.build_meta" +requires = [] + +[project] +name = "cuxfilter" +version = "23.08.00" +description = "GPU accelerated cross filtering with cuDF" +readme = { file = "README.md", content_type = "text/markdown" } +authors = [ + {name = "NVIDIA Corporation"}, +] +license = { text = "Apache 2.0" } +requires-python = ">=3.9" +dependencies = [] +classifiers = [ + "Intended Audience :: Developers", + "Topic :: Database", + "Topic :: Scientific/Engineering :: Visualization", + "License :: OSI Approved :: Apache Software License", + "Programming Language :: Python", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", +] + +[project.optional-dependencies] +test = [] + +[project.urls] +Homepage = "https://github.com/rapidsai/cuxfilter" +Documentation = "https://docs.rapids.ai/api/cuxfilter/stable/" + +[tool.setuptools] +license-files = ["LICENSE"] diff --git a/python/record.txt b/python/record.txt deleted file mode 100644 index 76dbafd8..00000000 --- a/python/record.txt +++ /dev/null @@ -1,125 +0,0 @@ -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/dataframe.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/_version.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/dashboard.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/datatile.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/layout_templates.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/layouts.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/chart_views.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/custom_tiles.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/get_open_port.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/screengrab.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/geojson_mapper.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/rapids.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/light.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/dark.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/test_dashboard.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/test_datatile.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/test_dataframe.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/download_datasets.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/unemployment_data_from_bokeh.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/random_signals.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/numba_kernels/gpu_datatile.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/numba_kernels/gpu_histogram.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/numba_kernels/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/bokeh/plots.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/bokeh/bokeh.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/bokeh/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/cudatashader.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/plots.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/core_view_dataframe.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/core_widget.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/core_chart.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/panel_widgets/plots.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/panel_widgets/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/panel_widgets/panel_widgets.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/altair/altair.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/altair/plots.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/altair/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/custom_extensions/interactive_image.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/custom_extensions/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/core_non_aggregate.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/core_scatter_geo.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/core_line.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/core_stacked_line.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/core_scatter.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/core_aggregate.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/core_aggregate_bar.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/core_aggregate_choropleth.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/core_aggregate_line.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/core_datasize_indicator.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/__init__.py -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/__pycache__/dataframe.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/__pycache__/_version.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/__pycache__/dashboard.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/__pycache__/datatile.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/__pycache__/layout_templates.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/__pycache__/layouts.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/__pycache__/chart_views.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/layouts/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/__pycache__/custom_tiles.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/__pycache__/get_open_port.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/__pycache__/screengrab.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/__pycache__/geojson_mapper.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/__pycache__/rapids.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/__pycache__/light.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/__pycache__/dark.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/themes/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/__pycache__/test_dashboard.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/__pycache__/test_datatile.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/__pycache__/test_dataframe.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/tests/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/__pycache__/download_datasets.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/__pycache__/unemployment_data_from_bokeh.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/__pycache__/random_signals.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/sampledata/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/numba_kernels/__pycache__/gpu_datatile.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/numba_kernels/__pycache__/gpu_histogram.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/assets/numba_kernels/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/bokeh/__pycache__/plots.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/bokeh/__pycache__/bokeh.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/bokeh/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/__pycache__/cudatashader.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/__pycache__/plots.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/__pycache__/core_view_dataframe.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/__pycache__/core_widget.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/__pycache__/core_chart.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/panel_widgets/__pycache__/plots.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/panel_widgets/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/panel_widgets/__pycache__/panel_widgets.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/altair/__pycache__/altair.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/altair/__pycache__/plots.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/altair/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/custom_extensions/__pycache__/interactive_image.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/cudatashader/custom_extensions/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/__pycache__/core_non_aggregate.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/__pycache__/core_scatter_geo.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/__pycache__/core_line.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/__pycache__/core_stacked_line.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/non_aggregate/__pycache__/core_scatter.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/__pycache__/core_aggregate.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/__pycache__/core_aggregate_bar.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/__pycache__/core_aggregate_choropleth.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/__pycache__/core_aggregate_line.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/__pycache__/core_datasize_indicator.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter/charts/core/aggregate/__pycache__/__init__.cpython-36.pyc -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter-0+untagged.395.g5cf055f.dirty-py3.6.egg-info/SOURCES.txt -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter-0+untagged.395.g5cf055f.dirty-py3.6.egg-info/PKG-INFO -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter-0+untagged.395.g5cf055f.dirty-py3.6.egg-info/top_level.txt -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter-0+untagged.395.g5cf055f.dirty-py3.6.egg-info/not-zip-safe -/home/ajay/anaconda3/envs/test_new1/lib/python3.6/site-packages/cuxfilter-0+untagged.395.g5cf055f.dirty-py3.6.egg-info/dependency_links.txt diff --git a/python/setup.cfg b/python/setup.cfg deleted file mode 100644 index bc8503f6..00000000 --- a/python/setup.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[versioneer] -VCS = git -style = pep440 -versionfile_source = cuxfilter/_version.py -versionfile_build = cuxfilter/_version.py -tag_prefix = v -parentdir_prefix = cuxfilter- - -[flake8] -exclude = __init__.py -ignore = - # line break before binary operator - W503 - # whitespace before : - E203 diff --git a/python/setup.py b/python/setup.py index e4622221..951b8247 100644 --- a/python/setup.py +++ b/python/setup.py @@ -1,36 +1,10 @@ from setuptools import find_packages, setup -import versioneer - -with open("README.md") as f: - readme = f.read() setup( - name="cuxfilter", - version=versioneer.get_version(), - description="GPU accelerated cross filtering with cuDF", - url="https://github.com/rapidsai/cuxfilter", - author="NVIDIA Corporation", - license="Apache 2.0", - classifiers=[ - "Intended Audience :: Developers", - "Topic :: Database", - "Topic :: Scientific/Engineering", - "License :: OSI Approved :: Apache Software License", - "Programming Language :: Python", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - ], packages=find_packages( include=["cuxfilter", "cuxfilter.*"], exclude=("tests", "docs", "notebooks"), ), - package_data=dict.fromkeys( - find_packages( - include=["cuxfilter.layouts.assets", "cuxfilter.themes.assets"] - ), - ["*.css", "*.html"], - ), - cmdclass=versioneer.get_cmdclass(), + package_data={"cuxfilter.themes.assets": ["*.css", "*.html"]}, zip_safe=False, ) diff --git a/python/versioneer.py b/python/versioneer.py deleted file mode 100644 index 3ac0310a..00000000 --- a/python/versioneer.py +++ /dev/null @@ -1,1903 +0,0 @@ -# Version: 0.18 - -"""The Versioneer - like a rocketeer, but for versions. - -The Versioneer -============== - -* like a rocketeer, but for versions! -* https://github.com/warner/python-versioneer -* Brian Warner -* License: Public Domain -* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, and pypy -* [![Latest Version] -(https://pypip.in/version/versioneer/badge.svg?style=flat) -](https://pypi.python.org/pypi/versioneer/) -* [![Build Status] -(https://travis-ci.org/warner/python-versioneer.png?branch=master) -](https://travis-ci.org/warner/python-versioneer) - -This is a tool for managing a recorded version number in distutils-based -python projects. The goal is to remove the tedious and error-prone "update -the embedded version string" step from your release process. Making a new -release should be as easy as recording a new tag in your version-control -system, and maybe making new tarballs. - - -## Quick Install - -* `pip install versioneer` to somewhere to your $PATH -* add a `[versioneer]` section to your setup.cfg (see below) -* run `versioneer install` in your source tree, commit the results - -## Version Identifiers - -Source trees come from a variety of places: - -* a version-control system checkout (mostly used by developers) -* a nightly tarball, produced by build automation -* a snapshot tarball, produced by a web-based VCS browser, like github's - "tarball from tag" feature -* a release tarball, produced by "setup.py sdist", distributed through PyPI - -Within each source tree, the version identifier (either a string or a number, -this tool is format-agnostic) can come from a variety of places: - -* ask the VCS tool itself, e.g. "git describe" (for checkouts), which knows - about recent "tags" and an absolute revision-id -* the name of the directory into which the tarball was unpacked -* an expanded VCS keyword ($Id$, etc) -* a `_version.py` created by some earlier build step - -For released software, the version identifier is closely related to a VCS -tag. Some projects use tag names that include more than just the version -string (e.g. "myproject-1.2" instead of just "1.2"), in which case the tool -needs to strip the tag prefix to extract the version identifier. For -unreleased software (between tags), the version identifier should provide -enough information to help developers recreate the same tree, while also -giving them an idea of roughly how old the tree is (after version 1.2, before -version 1.3). Many VCS systems can report a description that captures this, -for example `git describe --tags --dirty --always` reports things like -"0.7-1-g574ab98-dirty" to indicate that the checkout is one revision past the -0.7 tag, has a unique revision id of "574ab98", and is "dirty" (it has -uncommitted changes. - -The version identifier is used for multiple purposes: - -* to allow the module to self-identify its version: `myproject.__version__` -* to choose a name and prefix for a 'setup.py sdist' tarball - -## Theory of Operation - -Versioneer works by adding a special `_version.py` file into your source -tree, where your `__init__.py` can import it. This `_version.py` knows how to -dynamically ask the VCS tool for version information at import time. - -`_version.py` also contains `$Revision$` markers, and the installation -process marks `_version.py` to have this marker rewritten with a tag name -during the `git archive` command. As a result, generated tarballs will -contain enough information to get the proper version. - -To allow `setup.py` to compute a version too, a `versioneer.py` is added to -the top level of your source tree, next to `setup.py` and the `setup.cfg` -that configures it. This overrides several distutils/setuptools commands to -compute the version when invoked, and changes `setup.py build` and `setup.py -sdist` to replace `_version.py` with a small static file that contains just -the generated version data. - -## Installation - -See [INSTALL.md](./INSTALL.md) for detailed installation instructions. - -## Version-String Flavors - -Code which uses Versioneer can learn about its version string at runtime by -importing `_version` from your main `__init__.py` file and running the -`get_versions()` function. From the "outside" (e.g. in `setup.py`), you can -import the top-level `versioneer.py` and run `get_versions()`. - -Both functions return a dictionary with different flavors of version -information: - -* `['version']`: A condensed version string, rendered using the selected - style. This is the most commonly used value for the project's version - string. The default "pep440" style yields strings like `0.11`, - `0.11+2.g1076c97`, or `0.11+2.g1076c97.dirty`. See the "Styles" section - below for alternative styles. - -* `['full-revisionid']`: detailed revision identifier. For Git, this is the - full SHA1 commit id, e.g. "1076c978a8d3cfc70f408fe5974aa6c092c949ac". - -* `['date']`: Date and time of the latest `HEAD` commit. For Git, it is the - commit date in ISO 8601 format. This will be None if the date is not - available. - -* `['dirty']`: a boolean, True if the tree has uncommitted changes. Note that - this is only accurate if run in a VCS checkout, otherwise it is likely to - be False or None - -* `['error']`: if the version string could not be computed, this will be set - to a string describing the problem, otherwise it will be None. It may be - useful to throw an exception in setup.py if this is set, to avoid e.g. - creating tarballs with a version string of "unknown". - -Some variants are more useful than others. Including `full-revisionid` in a -bug report should allow developers to reconstruct the exact code being tested -(or indicate the presence of local changes that should be shared with the -developers). `version` is suitable for display in an "about" box or a CLI -`--version` output: it can be easily compared against release notes and lists -of bugs fixed in various releases. - -The installer adds the following text to your `__init__.py` to place a basic -version in `YOURPROJECT.__version__`: - - from ._version import get_versions - __version__ = get_versions()['version'] - del get_versions - -## Styles - -The setup.cfg `style=` configuration controls how the VCS information is -rendered into a version string. - -The default style, "pep440", produces a PEP440-compliant string, equal to the -un-prefixed tag name for actual releases, and containing an additional "local -version" section with more detail for in-between builds. For Git, this is -TAG[+DISTANCE.gHEX[.dirty]] , using information from `git describe --tags ---dirty --always`. For example "0.11+2.g1076c97.dirty" indicates that the -tree is like the "1076c97" commit but has uncommitted changes (".dirty"), and -that this commit is two revisions ("+2") beyond the "0.11" tag. For released -software (exactly equal to a known tag), the identifier will only contain the -stripped tag, e.g. "0.11". - -Other styles are available. See [details.md](details.md) in the Versioneer -source tree for descriptions. - -## Debugging - -Versioneer tries to avoid fatal errors: if something goes wrong, it will tend -to return a version of "0+unknown". To investigate the problem, run `setup.py -version`, which will run the version-lookup code in a verbose mode, and will -display the full contents of `get_versions()` (including the `error` string, -which may help identify what went wrong). - -## Known Limitations - -Some situations are known to cause problems for Versioneer. This details the -most significant ones. More can be found on Github -[issues page](https://github.com/warner/python-versioneer/issues). - -### Subprojects - -Versioneer has limited support for source trees in which `setup.py` is not in -the root directory (e.g. `setup.py` and `.git/` are *not* siblings). The are -two common reasons why `setup.py` might not be in the root: - -* Source trees which contain multiple subprojects, such as - [Buildbot](https://github.com/buildbot/buildbot), which contains both - "master" and "slave" subprojects, each with their own `setup.py`, - `setup.cfg`, and `tox.ini`. Projects like these produce multiple PyPI - distributions (and upload multiple independently-installable tarballs). -* Source trees whose main purpose is to contain a C library, but which also - provide bindings to Python (and perhaps other langauges) in subdirectories. - -Versioneer will look for `.git` in parent directories, and most operations -should get the right version string. However `pip` and `setuptools` have bugs -and implementation details which frequently cause `pip install .` from a -subproject directory to fail to find a correct version string (so it usually -defaults to `0+unknown`). - -`pip install --editable .` should work correctly. `setup.py install` might -work too. - -Pip-8.1.1 is known to have this problem, but hopefully it will get fixed in -some later version. - -[Bug #38](https://github.com/warner/python-versioneer/issues/38) is tracking -this issue. The discussion in -[PR #61](https://github.com/warner/python-versioneer/pull/61) describes the -issue from the Versioneer side in more detail. -[pip PR#3176](https://github.com/pypa/pip/pull/3176) and -[pip PR#3615](https://github.com/pypa/pip/pull/3615) contain work to improve -pip to let Versioneer work correctly. - -Versioneer-0.16 and earlier only looked for a `.git` directory next to the -`setup.cfg`, so subprojects were completely unsupported with those releases. - -### Editable installs with setuptools <= 18.5 - -`setup.py develop` and `pip install --editable .` allow you to install a -project into a virtualenv once, then continue editing the source code (and -test) without re-installing after every change. - -"Entry-point scripts" (`setup(entry_points={"console_scripts": ..})`) are a -convenient way to specify executable scripts that should be installed along -with the python package. - -These both work as expected when using modern setuptools. When using -setuptools-18.5 or earlier, however, certain operations will cause -`pkg_resources.DistributionNotFound` errors when running the entrypoint -script, which must be resolved by re-installing the package. This happens -when the install happens with one version, then the egg_info data is -regenerated while a different version is checked out. Many setup.py commands -cause egg_info to be rebuilt (including `sdist`, `wheel`, and installing into -a different virtualenv), so this can be surprising. - -[Bug #83](https://github.com/warner/python-versioneer/issues/83) describes -this one, but upgrading to a newer version of setuptools should probably -resolve it. - -### Unicode version strings - -While Versioneer works (and is continually tested) with both Python 2 and -Python 3, it is not entirely consistent with bytes-vs-unicode distinctions. -Newer releases probably generate unicode version strings on py2. It's not -clear that this is wrong, but it may be surprising for applications when then -write these strings to a network connection or include them in bytes-oriented -APIs like cryptographic checksums. - -[Bug #71](https://github.com/warner/python-versioneer/issues/71) investigates -this question. - - -## Updating Versioneer - -To upgrade your project to a new release of Versioneer, do the following: - -* install the new Versioneer (`pip install -U versioneer` or equivalent) -* edit `setup.cfg`, if necessary, to include any new configuration settings - indicated by the release notes. See [UPGRADING](./UPGRADING.md) for details. -* re-run `versioneer install` in your source tree, to replace - `SRC/_version.py` -* commit any changed files - -## Future Directions - -This tool is designed to make it easily extended to other version-control -systems: all VCS-specific components are in separate directories like -src/git/ . The top-level `versioneer.py` script is assembled from these -components by running make-versioneer.py . In the future, make-versioneer.py -will take a VCS name as an argument, and will construct a version of -`versioneer.py` that is specific to the given VCS. It might also take the -configuration arguments that are currently provided manually during -installation by editing setup.py . Alternatively, it might go the other -direction and include code from all supported VCS systems, reducing the -number of intermediate scripts. - - -## License - -To make Versioneer easier to embed, all its code is dedicated to the public -domain. The `_version.py` that it creates is also in the public domain. -Specifically, both are released under the Creative Commons "Public Domain -Dedication" license (CC0-1.0), as described in -https://creativecommons.org/publicdomain/zero/1.0/ . - -""" - -from __future__ import print_function - -try: - import configparser -except ImportError: - import ConfigParser as configparser -import errno -import json -import os -import re -import subprocess -import sys - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_root(): - """Get the project root directory. - - We require that all commands are run from the project root, i.e. the - directory that contains setup.py, setup.cfg, and versioneer.py . - """ - root = os.path.realpath(os.path.abspath(os.getcwd())) - setup_py = os.path.join(root, "setup.py") - versioneer_py = os.path.join(root, "versioneer.py") - if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): - # allow 'python path/to/setup.py COMMAND' - root = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0]))) - setup_py = os.path.join(root, "setup.py") - versioneer_py = os.path.join(root, "versioneer.py") - if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): - err = ( - "Versioneer was unable to run the project root directory. " - "Versioneer requires setup.py to be executed from " - "its immediate directory (like 'python setup.py COMMAND'), " - "or in a way that lets it use sys.argv[0] to find the root " - "(like 'python path/to/setup.py COMMAND')." - ) - raise VersioneerBadRootError(err) - try: - # Certain runtime workflows (setup.py install/develop in a setuptools - # tree) execute all dependencies in a single python process, so - # "versioneer" may be imported multiple times, and python's shared - # module-import table will cache the first one. So we can't use - # os.path.dirname(__file__), as that will find whichever - # versioneer.py was first imported, even in later projects. - me = os.path.realpath(os.path.abspath(__file__)) - me_dir = os.path.normcase(os.path.splitext(me)[0]) - vsr_dir = os.path.normcase(os.path.splitext(versioneer_py)[0]) - if me_dir != vsr_dir: - print( - "Warning: build in %s is using versioneer.py from %s" - % (os.path.dirname(me), versioneer_py) - ) - except NameError: - pass - return root - - -def get_config_from_root(root): - """Read the project setup.cfg file to determine Versioneer config.""" - # This might raise EnvironmentError (if setup.cfg is missing), or - # configparser.NoSectionError (if it lacks a [versioneer] section), or - # configparser.NoOptionError (if it lacks "VCS="). See the docstring at - # the top of versioneer.py for instructions on writing your setup.cfg . - setup_cfg = os.path.join(root, "setup.cfg") - parser = configparser.SafeConfigParser() - with open(setup_cfg, "r") as f: - parser.readfp(f) - VCS = parser.get("versioneer", "VCS") # mandatory - - def get(parser, name): - if parser.has_option("versioneer", name): - return parser.get("versioneer", name) - return None - - cfg = VersioneerConfig() - cfg.VCS = VCS - cfg.style = get(parser, "style") or "" - cfg.versionfile_source = get(parser, "versionfile_source") - cfg.versionfile_build = get(parser, "versionfile_build") - cfg.tag_prefix = get(parser, "tag_prefix") - if cfg.tag_prefix in ("''", '""'): - cfg.tag_prefix = "" - cfg.parentdir_prefix = get(parser, "parentdir_prefix") - cfg.verbose = get(parser, "verbose") - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -# these dictionaries contain VCS-specific tools -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - - return decorate - - -def run_command( - commands, args, cwd=None, verbose=False, hide_stderr=False, env=None -): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen( - [c] + args, - cwd=cwd, - env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr else None), - ) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %s" % dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %s" % (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) - return None, p.returncode - return stdout, p.returncode - - -LONG_VERSION_PY[ - "git" -] = ''' -# This file helps to compute a version number in source trees obtained from -# git-archive tarball (such as those provided by githubs download-from-tag -# feature). Distribution tarballs (built by setup.py sdist) and build -# directories (produced by setup.py build) will contain a much shorter file -# that just contains the computed version number. - -# This file is released into the public domain. Generated by -# versioneer-0.18 (https://github.com/warner/python-versioneer) - -"""Git implementation of _version.py.""" - -import errno -import os -import re -import subprocess -import sys - - -def get_keywords(): - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must - # each be defined on a line of their own. _version.py will just call - # get_keywords(). - git_refnames = "%(DOLLAR)sFormat:%%d%(DOLLAR)s" - git_full = "%(DOLLAR)sFormat:%%H%(DOLLAR)s" - git_date = "%(DOLLAR)sFormat:%%ci%(DOLLAR)s" - keywords = {"refnames": git_refnames, "full": git_full, "date": git_date} - return keywords - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_config(): - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py - cfg = VersioneerConfig() - cfg.VCS = "git" - cfg.style = "%(STYLE)s" - cfg.tag_prefix = "%(TAG_PREFIX)s" - cfg.parentdir_prefix = "%(PARENTDIR_PREFIX)s" - cfg.versionfile_source = "%(VERSIONFILE_SOURCE)s" - cfg.verbose = False - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - return decorate - - -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - env=None): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen([c] + args, cwd=cwd, env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %%s" %% dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %%s" %% (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %%s (error)" %% dispcmd) - print("stdout was %%s" %% stdout) - return None, p.returncode - return stdout, p.returncode - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %%s but none started with prefix %%s" %% - (str(rootdirs), parentdir_prefix)) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search('=\\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search('=\\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search('=\\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %%d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search('\\d', r)]) - if verbose: - print("discarding '%%s', no digits" %% ",".join(refs - tags)) - if verbose: - print("likely tags: %%s" %% ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] - if verbose: - print("picking %%s" %% r) - return {"version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": None, - "date": date} - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return {"version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": "no suitable tags", "date": None} - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, - hide_stderr=True) - if rc != 0: - if verbose: - print("Directory %%s not under git control" %% root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", - "--always", "--long", - "--match", "%%s*" %% tag_prefix], - cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[:git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search('^(.+)-(\\d+)-g([0-9a-f]+)$', git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%%s'" - %% describe_out) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%%s' doesn't start with prefix '%%s'" - print(fmt %% (full_tag, tag_prefix)) - pieces["error"] = ("tag '%%s' doesn't start with prefix '%%s'" - %% (full_tag, tag_prefix)) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix):] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], - cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%%ci", "HEAD"], - cwd=root)[0].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%%d.g%%s" %% (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%%d.g%%s" %% (pieces["distance"], - pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%%d" %% pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%%d" %% pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%%s" %% pieces["short"] - else: - # exception #1 - rendered = "0.post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%%s" %% pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None} - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%%s'" %% style) - - return {"version": rendered, "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], "error": None, - "date": pieces.get("date")} - - -def get_versions(): - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some - # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which - # case we can only use expanded keywords. - - cfg = get_config() - verbose = cfg.verbose - - try: - return git_versions_from_keywords(get_keywords(), cfg.tag_prefix, - verbose) - except NotThisMethod: - pass - - try: - root = os.path.realpath(__file__) - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. - for i in cfg.versionfile_source.split('/'): - root = os.path.dirname(root) - except NameError: - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to find root of source tree", - "date": None} - - try: - pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose) - return render(pieces, cfg.style) - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - return versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - except NotThisMethod: - pass - - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to compute version", "date": None} -''' - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG) :] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r"\d", r)]) - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: - print("likely tags: %s" % ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix) :] - if verbose: - print("picking %s" % r) - return { - "version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, - "error": None, - "date": date, - } - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return { - "version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, - "error": "no suitable tags", - "date": None, - } - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command( - GITS, ["rev-parse", "--git-dir"], cwd=root, hide_stderr=True - ) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command( - GITS, - [ - "describe", - "--tags", - "--dirty", - "--always", - "--long", - "--match", - "%s*" % tag_prefix, - ], - cwd=root, - ) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[: git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ( - "unable to parse git-describe output: '%s'" % describe_out - ) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) - pieces["error"] = "tag '%s' doesn't start with prefix '%s'" % ( - full_tag, - tag_prefix, - ) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix) :] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command( - GITS, ["rev-list", "HEAD", "--count"], cwd=root - ) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], cwd=root)[ - 0 - ].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def do_vcs_install(manifest_in, versionfile_source, ipy): - """Git-specific installation logic for Versioneer. - - For Git, this means creating/changing .gitattributes to mark _version.py - for export-subst keyword substitution. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - files = [manifest_in, versionfile_source] - if ipy: - files.append(ipy) - try: - me = __file__ - if me.endswith(".pyc") or me.endswith(".pyo"): - me = os.path.splitext(me)[0] + ".py" - versioneer_file = os.path.relpath(me) - except NameError: - versioneer_file = "versioneer.py" - files.append(versioneer_file) - present = False - try: - f = open(".gitattributes", "r") - for line in f.readlines(): - if line.strip().startswith(versionfile_source): - if "export-subst" in line.strip().split()[1:]: - present = True - f.close() - except EnvironmentError: - pass - if not present: - f = open(".gitattributes", "a+") - f.write("%s export-subst\n" % versionfile_source) - f.close() - files.append(".gitattributes") - run_command(GITS, ["add", "--"] + files) - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return { - "version": dirname[len(parentdir_prefix) :], - "full-revisionid": None, - "dirty": False, - "error": None, - "date": None, - } - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print( - "Tried directories %s but none started with prefix %s" - % (str(rootdirs), parentdir_prefix) - ) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -SHORT_VERSION_PY = """ -# This file was generated by 'versioneer.py' (0.18) from -# revision-control system data, or from the parent directory name of an -# unpacked source archive. Distribution tarballs contain a pre-generated copy -# of this file. - -import json - -version_json = ''' -%s -''' # END VERSION_JSON - - -def get_versions(): - return json.loads(version_json) -""" - - -def versions_from_file(filename): - """Try to determine the version from _version.py if present.""" - try: - with open(filename) as f: - contents = f.read() - except EnvironmentError: - raise NotThisMethod("unable to read _version.py") - mo = re.search( - r"version_json = '''\n(.*)''' # END VERSION_JSON", - contents, - re.M | re.S, - ) - if not mo: - mo = re.search( - r"version_json = '''\r\n(.*)''' # END VERSION_JSON", - contents, - re.M | re.S, - ) - if not mo: - raise NotThisMethod("no version_json in _version.py") - return json.loads(mo.group(1)) - - -def write_to_version_file(filename, versions): - """Write the given version number to the given _version.py file.""" - os.unlink(filename) - contents = json.dumps( - versions, sort_keys=True, indent=1, separators=(",", ": ") - ) - with open(filename, "w") as f: - f.write(SHORT_VERSION_PY % contents) - - print("set %s to '%s'" % (filename, versions["version"])) - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%d" % pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%d" % pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%s" % pieces["short"] - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%s" % pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return { - "version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None, - } - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%s'" % style) - - return { - "version": rendered, - "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], - "error": None, - "date": pieces.get("date"), - } - - -class VersioneerBadRootError(Exception): - """The project root directory is unknown or missing key files.""" - - -def get_versions(verbose=False): - """Get the project version from whatever source is available. - - Returns dict with two keys: 'version' and 'full'. - """ - if "versioneer" in sys.modules: - # see the discussion in cmdclass.py:get_cmdclass() - del sys.modules["versioneer"] - - root = get_root() - cfg = get_config_from_root(root) - - assert cfg.VCS is not None, "please set [versioneer]VCS= in setup.cfg" - handlers = HANDLERS.get(cfg.VCS) - assert handlers, "unrecognized VCS '%s'" % cfg.VCS - verbose = verbose or cfg.verbose - assert ( - cfg.versionfile_source is not None - ), "please set versioneer.versionfile_source" - assert cfg.tag_prefix is not None, "please set versioneer.tag_prefix" - - versionfile_abs = os.path.join(root, cfg.versionfile_source) - - # extract version from first of: _version.py, VCS command (e.g. 'git - # describe'), parentdir. This is meant to work for developers using a - # source checkout, for users of a tarball created by 'setup.py sdist', - # and for users of a tarball/zipball created by 'git archive' or github's - # download-from-tag feature or the equivalent in other VCSes. - - get_keywords_f = handlers.get("get_keywords") - from_keywords_f = handlers.get("keywords") - if get_keywords_f and from_keywords_f: - try: - keywords = get_keywords_f(versionfile_abs) - ver = from_keywords_f(keywords, cfg.tag_prefix, verbose) - if verbose: - print("got version from expanded keyword %s" % ver) - return ver - except NotThisMethod: - pass - - try: - ver = versions_from_file(versionfile_abs) - if verbose: - print("got version from file %s %s" % (versionfile_abs, ver)) - return ver - except NotThisMethod: - pass - - from_vcs_f = handlers.get("pieces_from_vcs") - if from_vcs_f: - try: - pieces = from_vcs_f(cfg.tag_prefix, root, verbose) - ver = render(pieces, cfg.style) - if verbose: - print("got version from VCS %s" % ver) - return ver - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - ver = versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - if verbose: - print("got version from parentdir %s" % ver) - return ver - except NotThisMethod: - pass - - if verbose: - print("unable to compute version") - - return { - "version": "0+unknown", - "full-revisionid": None, - "dirty": None, - "error": "unable to compute version", - "date": None, - } - - -def get_version(): - """Get the short version string for this project.""" - return get_versions()["version"] - - -def get_cmdclass(): - """Get the custom setuptools/distutils subclasses used by Versioneer.""" - if "versioneer" in sys.modules: - del sys.modules["versioneer"] - # this fixes the "python setup.py develop" case (also 'install' and - # 'easy_install .'), in which subdependencies of the main project are - # built (using setup.py bdist_egg) in the same python process. Assume - # a main project A and a dependency B, which use different versions - # of Versioneer. A's setup.py imports A's Versioneer, leaving it in - # sys.modules by the time B's setup.py is executed, causing B to run - # with the wrong versioneer. Setuptools wraps the sub-dep builds in a - # sandbox that restores sys.modules to it's pre-build state, so the - # parent is protected against the child's "import versioneer". By - # removing ourselves from sys.modules here, before the child build - # happens, we protect the child from the parent's versioneer too. - # Also see https://github.com/warner/python-versioneer/issues/52 - - cmds = {} - - # we add "version" to both distutils and setuptools - from distutils.core import Command - - class cmd_version(Command): - description = "report generated version string" - user_options = [] - boolean_options = [] - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - vers = get_versions(verbose=True) - print("Version: %s" % vers["version"]) - print(" full-revisionid: %s" % vers.get("full-revisionid")) - print(" dirty: %s" % vers.get("dirty")) - print(" date: %s" % vers.get("date")) - if vers["error"]: - print(" error: %s" % vers["error"]) - - cmds["version"] = cmd_version - - # we override "build_py" in both distutils and setuptools - # - # most invocation pathways end up running build_py: - # distutils/build -> build_py - # distutils/install -> distutils/build ->.. - # setuptools/bdist_wheel -> distutils/install ->.. - # setuptools/bdist_egg -> distutils/install_lib -> build_py - # setuptools/install -> bdist_egg ->.. - # setuptools/develop -> ? - # pip install: - # copies source tree to a tempdir before running egg_info/etc - # if .git isn't copied too, 'git describe' will fail - # then does setup.py bdist_wheel, or sometimes setup.py install - # setup.py egg_info -> ? - - # we override different "build_py" commands for both environments - if "setuptools" in sys.modules: - from setuptools.command.build_py import build_py as _build_py - else: - from distutils.command.build_py import build_py as _build_py - - class cmd_build_py(_build_py): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - _build_py.run(self) - # now locate _version.py in the new build/ directory and replace - # it with an updated value - if cfg.versionfile_build: - target_versionfile = os.path.join( - self.build_lib, cfg.versionfile_build - ) - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - - cmds["build_py"] = cmd_build_py - - if "cx_Freeze" in sys.modules: # cx_freeze enabled? - from cx_Freeze.dist import build_exe as _build_exe - - # nczeczulin reports that py2exe won't like the pep440-style string - # as FILEVERSION, but it can be used for PRODUCTVERSION, e.g. - # setup(console=[{ - # "version": versioneer.get_version().split("+", 1)[0], # FILEVERSION - # "product_version": versioneer.get_version(), - # ... - - class cmd_build_exe(_build_exe): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - target_versionfile = cfg.versionfile_source - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - - _build_exe.run(self) - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write( - LONG - % { - "DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - } - ) - - cmds["build_exe"] = cmd_build_exe - del cmds["build_py"] - - if "py2exe" in sys.modules: # py2exe enabled? - try: - from py2exe.distutils_buildexe import py2exe as _py2exe # py3 - except ImportError: - from py2exe.build_exe import py2exe as _py2exe # py2 - - class cmd_py2exe(_py2exe): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - target_versionfile = cfg.versionfile_source - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - - _py2exe.run(self) - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write( - LONG - % { - "DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - } - ) - - cmds["py2exe"] = cmd_py2exe - - # we override different "sdist" commands for both environments - if "setuptools" in sys.modules: - from setuptools.command.sdist import sdist as _sdist - else: - from distutils.command.sdist import sdist as _sdist - - class cmd_sdist(_sdist): - def run(self): - versions = get_versions() - self._versioneer_generated_versions = versions - # unless we update this, the command will keep using the old - # version - self.distribution.metadata.version = versions["version"] - return _sdist.run(self) - - def make_release_tree(self, base_dir, files): - root = get_root() - cfg = get_config_from_root(root) - _sdist.make_release_tree(self, base_dir, files) - # now locate _version.py in the new base_dir directory - # (remembering that it may be a hardlink) and replace it with an - # updated value - target_versionfile = os.path.join(base_dir, cfg.versionfile_source) - print("UPDATING %s" % target_versionfile) - write_to_version_file( - target_versionfile, self._versioneer_generated_versions - ) - - cmds["sdist"] = cmd_sdist - - return cmds - - -CONFIG_ERROR = """ -setup.cfg is missing the necessary Versioneer configuration. You need -a section like: - - [versioneer] - VCS = git - style = pep440 - versionfile_source = src/myproject/_version.py - versionfile_build = myproject/_version.py - tag_prefix = - parentdir_prefix = myproject- - -You will also need to edit your setup.py to use the results: - - import versioneer - setup(version=versioneer.get_version(), - cmdclass=versioneer.get_cmdclass(), ...) - -Please read the docstring in ./versioneer.py for configuration instructions, -edit setup.cfg, and re-run the installer or 'python versioneer.py setup'. -""" - -SAMPLE_CONFIG = """ -# See the docstring in versioneer.py for instructions. Note that you must -# re-run 'versioneer.py setup' after changing this section, and commit the -# resulting files. - -[versioneer] -#VCS = git -#style = pep440 -#versionfile_source = -#versionfile_build = -#tag_prefix = -#parentdir_prefix = - -""" - -INIT_PY_SNIPPET = """ -from ._version import get_versions -__version__ = get_versions()['version'] -del get_versions -""" - - -def do_setup(): - """Main VCS-independent setup function for installing Versioneer.""" - root = get_root() - try: - cfg = get_config_from_root(root) - except ( - EnvironmentError, - configparser.NoSectionError, - configparser.NoOptionError, - ) as e: - if isinstance(e, (EnvironmentError, configparser.NoSectionError)): - print( - "Adding sample versioneer config to setup.cfg", file=sys.stderr - ) - with open(os.path.join(root, "setup.cfg"), "a") as f: - f.write(SAMPLE_CONFIG) - print(CONFIG_ERROR, file=sys.stderr) - return 1 - - print(" creating %s" % cfg.versionfile_source) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write( - LONG - % { - "DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - } - ) - - ipy = os.path.join(os.path.dirname(cfg.versionfile_source), "__init__.py") - if os.path.exists(ipy): - try: - with open(ipy, "r") as f: - old = f.read() - except EnvironmentError: - old = "" - if INIT_PY_SNIPPET not in old: - print(" appending to %s" % ipy) - with open(ipy, "a") as f: - f.write(INIT_PY_SNIPPET) - else: - print(" %s unmodified" % ipy) - else: - print(" %s doesn't exist, ok" % ipy) - ipy = None - - # Make sure both the top-level "versioneer.py" and versionfile_source - # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so - # they'll be copied into source distributions. Pip won't be able to - # install the package without this. - manifest_in = os.path.join(root, "MANIFEST.in") - simple_includes = set() - try: - with open(manifest_in, "r") as f: - for line in f: - if line.startswith("include "): - for include in line.split()[1:]: - simple_includes.add(include) - except EnvironmentError: - pass - # That doesn't cover everything MANIFEST.in can do - # (http://docs.python.org/2/distutils/sourcedist.html#commands), so - # it might give some false negatives. Appending redundant 'include' - # lines is safe, though. - if "versioneer.py" not in simple_includes: - print(" appending 'versioneer.py' to MANIFEST.in") - with open(manifest_in, "a") as f: - f.write("include versioneer.py\n") - else: - print(" 'versioneer.py' already in MANIFEST.in") - if cfg.versionfile_source not in simple_includes: - print( - " appending versionfile_source ('%s') to MANIFEST.in" - % cfg.versionfile_source - ) - with open(manifest_in, "a") as f: - f.write("include %s\n" % cfg.versionfile_source) - else: - print(" versionfile_source already in MANIFEST.in") - - # Make VCS-specific changes. For git, this means creating/changing - # .gitattributes to mark _version.py for export-subst keyword - # substitution. - do_vcs_install(manifest_in, cfg.versionfile_source, ipy) - return 0 - - -def scan_setup_py(): - """Validate the contents of setup.py against Versioneer's expectations.""" - found = set() - setters = False - errors = 0 - with open("setup.py", "r") as f: - for line in f.readlines(): - if "import versioneer" in line: - found.add("import") - if "versioneer.get_cmdclass()" in line: - found.add("cmdclass") - if "versioneer.get_version()" in line: - found.add("get_version") - if "versioneer.VCS" in line: - setters = True - if "versioneer.versionfile_source" in line: - setters = True - if len(found) != 3: - print("") - print("Your setup.py appears to be missing some important items") - print("(but I might be wrong). Please make sure it has something") - print("roughly like the following:") - print("") - print(" import versioneer") - print(" setup( version=versioneer.get_version(),") - print(" cmdclass=versioneer.get_cmdclass(), ...)") - print("") - errors += 1 - if setters: - print("You should remove lines like 'versioneer.VCS = ' and") - print("'versioneer.versionfile_source = ' . This configuration") - print("now lives in setup.cfg, and should be removed from setup.py") - print("") - errors += 1 - return errors - - -if __name__ == "__main__": - cmd = sys.argv[1] - if cmd == "setup": - errors = do_setup() - errors += scan_setup_py() - if errors: - sys.exit(1) From f8e992e7118c0d7fc49cfae8516a1713609bb7eb Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 30 Jun 2023 11:07:14 -0700 Subject: [PATCH 25/56] add gha to build, publish and test wheels --- .github/workflows/build.yaml | 20 ++++++++++++++++++++ .github/workflows/pr.yaml | 19 +++++++++++++++++++ .github/workflows/test.yaml | 8 ++++++++ ci/release/wheel_smoke_test.py | 4 ++++ 4 files changed, 51 insertions(+) create mode 100644 ci/release/wheel_smoke_test.py diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8871345e..00aef38e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -57,3 +57,23 @@ jobs: node_type: "gpu-v100-latest-1" run_script: "ci/build_docs.sh" sha: ${{ inputs.sha }} + wheel-build: + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.08 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + sha: ${{ inputs.sha }} + date: ${{ inputs.date }} + package-name: cudf + package-dir: python/cuxfilter + wheel-publish: + needs: wheel-build + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@branch-23.08 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + sha: ${{ inputs.sha }} + date: ${{ inputs.date }} + package-name: cuxfilter diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 6052ec7b..c6fd86ad 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -17,6 +17,8 @@ jobs: - conda-python-tests - conda-notebook-tests - docs-build + - wheel-build + - wheel-tests secrets: inherit uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@cuda-120 checks: @@ -55,3 +57,20 @@ jobs: arch: "amd64" container_image: "rapidsai/ci:latest" run_script: "ci/build_docs.sh" + wheel-build: + needs: checks + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.08 + with: + build_type: pull-request + package-name: cuxfilter + package-dir: python + wheel-tests: + needs: wheel-build + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.08 + with: + build_type: pull-request + package-name: cuxfilter + test-unittest: "python -m pytest -n 8 ./python/cuxfilter/tests" + test-smoketest: "python ./ci/wheel_smoke_test.py" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c4ad5f46..73787591 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -22,3 +22,11 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} + wheel-tests: + needs: wheel-build + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.08 + with: + build_type: pull-request + package-name: cuxfilter + test-unittest: "python -m pytest -n 8 ./python/cuxfilter/tests" diff --git a/ci/release/wheel_smoke_test.py b/ci/release/wheel_smoke_test.py new file mode 100644 index 00000000..225de7bd --- /dev/null +++ b/ci/release/wheel_smoke_test.py @@ -0,0 +1,4 @@ +import cuxfilter + +if __name__ == '__main__': + assert cuxfilter.__version__ is not None \ No newline at end of file From 343e4b747166c4934f71704bc5112c9a21ed9ce2 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 30 Jun 2023 11:10:52 -0700 Subject: [PATCH 26/56] add new line at the end --- .flake8 | 2 +- ci/release/wheel_smoke_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.flake8 b/.flake8 index 0c711576..0494ee99 100644 --- a/.flake8 +++ b/.flake8 @@ -8,4 +8,4 @@ ignore = # line break before binary operator W503, # whitespace before : - E203 \ No newline at end of file + E203 diff --git a/ci/release/wheel_smoke_test.py b/ci/release/wheel_smoke_test.py index 225de7bd..29840ec4 100644 --- a/ci/release/wheel_smoke_test.py +++ b/ci/release/wheel_smoke_test.py @@ -1,4 +1,4 @@ import cuxfilter if __name__ == '__main__': - assert cuxfilter.__version__ is not None \ No newline at end of file + assert cuxfilter.__version__ is not None From 580f1c089c09487e2e3ccdd988bb46188f4942c6 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 30 Jun 2023 11:33:07 -0700 Subject: [PATCH 27/56] add apply_wheel_modifications script --- ci/release/apply_wheel_modifications.sh | 22 ++++++++++++++++++++++ ci/{release => utils}/wheel_smoke_test.py | 0 2 files changed, 22 insertions(+) create mode 100755 ci/release/apply_wheel_modifications.sh rename ci/{release => utils}/wheel_smoke_test.py (100%) diff --git a/ci/release/apply_wheel_modifications.sh b/ci/release/apply_wheel_modifications.sh new file mode 100755 index 00000000..506009c2 --- /dev/null +++ b/ci/release/apply_wheel_modifications.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Copyright (c) 2023, NVIDIA CORPORATION. +# +# Usage: bash apply_wheel_modifications.sh + +VERSION=${1} +CUDA_SUFFIX=${2} + +# pyproject.toml versions +sed -i "s/^version = .*/version = \"${VERSION}\"/g" python/cuxfilter/pyproject.toml + +# cuxfilter pyproject.toml cuda suffixes +sed -i "s/^name = \"cuxfilter\"/name = \"cuxfilter${CUDA_SUFFIX}\"/g" python/cuxfilter/pyproject.toml +# Need to provide the == to avoid modifying the URL +sed -i "s/\"cudf==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml +sed -i "s/\"cuspatial==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml +sed -i "s/\"dask-cuda==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml +sed -i "s/\"dask-cudf==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml + +if [[ $CUDA_SUFFIX == "-cu12" ]]; then + sed -i "s/numba[<=>\.,0-9]*/numba>=0.57/g" python/cuxfilter/pyproject.toml +fi \ No newline at end of file diff --git a/ci/release/wheel_smoke_test.py b/ci/utils/wheel_smoke_test.py similarity index 100% rename from ci/release/wheel_smoke_test.py rename to ci/utils/wheel_smoke_test.py From 9f1d287610a08126ccf1ab1f55bafb6a84c23a05 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 30 Jun 2023 11:46:33 -0700 Subject: [PATCH 28/56] rm README file --- python/README.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 python/README.md diff --git a/python/README.md b/python/README.md deleted file mode 100644 index 7376206b..00000000 --- a/python/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# cuxfilter.py - -Python library to do server-side cross-filtering viz dashboards using cudf, panel & bokeh. \ No newline at end of file From 000969c1a7d6a4e7b25086dd9839d1ef968c990a Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 30 Jun 2023 11:47:24 -0700 Subject: [PATCH 29/56] Add symbolic link to README file to fix pyproject.toml referencing a README.md that does not exist --- python/README.md | 1 + 1 file changed, 1 insertion(+) create mode 120000 python/README.md diff --git a/python/README.md b/python/README.md new file mode 120000 index 00000000..32d46ee8 --- /dev/null +++ b/python/README.md @@ -0,0 +1 @@ +../README.md \ No newline at end of file From e64915f16151b7eeb2b108af4c5f0a84d653ae04 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 30 Jun 2023 11:59:08 -0700 Subject: [PATCH 30/56] fix typo --- python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index 3d91fac1..95fa9044 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -8,7 +8,7 @@ requires = [] name = "cuxfilter" version = "23.08.00" description = "GPU accelerated cross filtering with cuDF" -readme = { file = "README.md", content_type = "text/markdown" } +readme = { file = "README.md", content-type = "text/markdown" } authors = [ {name = "NVIDIA Corporation"}, ] From d3ee729eba2a8976e743743eb507e8b84bc03908 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 10:08:44 -0700 Subject: [PATCH 31/56] Update .pre-commit-config.yaml Co-authored-by: AJ Schmidt --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 58b406de..af7e646b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: types_or: [python, cython] additional_dependencies: ["flake8-force"] - repo: https://github.com/rapidsai/dependency-file-generator - rev: v1.5.1 + rev: v1.5.2 hooks: - id: rapids-dependency-file-generator args: ["--clean"] From fb40b09eaf9d989bfa3184fe0fc54648c15a4bc7 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 10:59:43 -0700 Subject: [PATCH 32/56] update to cuda12 --- .github/workflows/build.yaml | 4 ++-- .github/workflows/pr.yaml | 4 ++-- .github/workflows/test.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 00aef38e..414c13c9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -59,7 +59,7 @@ jobs: sha: ${{ inputs.sha }} wheel-build: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-120 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -70,7 +70,7 @@ jobs: wheel-publish: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@cuda-120 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c6fd86ad..2a0ee13a 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -60,7 +60,7 @@ jobs: wheel-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-120 with: build_type: pull-request package-name: cuxfilter @@ -68,7 +68,7 @@ jobs: wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-120 with: build_type: pull-request package-name: cuxfilter diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 73787591..dfd8a80b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -25,7 +25,7 @@ jobs: wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-120 with: build_type: pull-request package-name: cuxfilter From d124ee1858328fb4b7a5490ce260fad713e3e47e Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 11:10:31 -0700 Subject: [PATCH 33/56] fix pyproject.toml path --- ci/release/apply_wheel_modifications.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ci/release/apply_wheel_modifications.sh b/ci/release/apply_wheel_modifications.sh index 506009c2..fa4b6a4a 100755 --- a/ci/release/apply_wheel_modifications.sh +++ b/ci/release/apply_wheel_modifications.sh @@ -7,16 +7,17 @@ VERSION=${1} CUDA_SUFFIX=${2} # pyproject.toml versions -sed -i "s/^version = .*/version = \"${VERSION}\"/g" python/cuxfilter/pyproject.toml +sed -i "s/^version = .*/version = \"${VERSION}\"/g" python/pyproject.toml # cuxfilter pyproject.toml cuda suffixes -sed -i "s/^name = \"cuxfilter\"/name = \"cuxfilter${CUDA_SUFFIX}\"/g" python/cuxfilter/pyproject.toml +sed -i "s/^name = \"cuxfilter\"/name = \"cuxfilter${CUDA_SUFFIX}\"/g" python/pyproject.toml # Need to provide the == to avoid modifying the URL -sed -i "s/\"cudf==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml -sed -i "s/\"cuspatial==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml -sed -i "s/\"dask-cuda==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml -sed -i "s/\"dask-cudf==/\"cudf${CUDA_SUFFIX}==/g" python/cuxfilter/pyproject.toml +sed -i "s/\"cudf==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml +sed -i "s/\"cuspatial==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml +sed -i "s/\"dask-cuda==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml +sed -i "s/\"dask-cudf==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml if [[ $CUDA_SUFFIX == "-cu12" ]]; then - sed -i "s/numba[<=>\.,0-9]*/numba>=0.57/g" python/cuxfilter/pyproject.toml + sed -i "s/numba[<=>\.,0-9]*/numba>=0.57/g" python/pyproject.toml + sed -i "s/cuda-python[<=>\.,0-9]*/cuda-python>=12.0,<13.0/g" python/pyproject.toml fi \ No newline at end of file From f20cb8cd7dde1bd87401eff4c922f88deea7f8e8 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 12:12:42 -0700 Subject: [PATCH 34/56] update dependencies.yaml to include pyproject.toml --- dependencies.yaml | 35 ++++++++++++++++++++++++++++++++--- python/pyproject.toml | 32 +++++++++++++++++++++++++++++--- 2 files changed, 61 insertions(+), 6 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index bf9b2cb6..2ac16df0 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -6,6 +6,7 @@ files: cuda: ["11.8", "12.0"] arch: [x86_64] includes: + - build_wheels - cudatoolkit - checks - docs @@ -35,12 +36,40 @@ files: - cudatoolkit - docs - py_version + py_build: + output: pyproject + pyproject_dir: python + extras: + table: build-system + includes: + - build_wheels + py_run: + output: pyproject + pyproject_dir: python + extras: + table: project + includes: + - run + py_test: + output: pyproject + pyproject_dir: python + extras: + table: project.optional-dependencies + key: test + includes: + - test_python channels: - rapidsai - rapidsai-nightly - conda-forge - nvidia dependencies: + build_wheels: + common: + - output_types: pyproject + packages: + - wheel + - setuptools cudatoolkit: specific: - output_types: conda @@ -115,7 +144,7 @@ dependencies: - python>=3.9,<3.11 run: common: - - output_types: [conda, requirements] + - output_types: [conda, requirements, pyproject] packages: - bokeh>=2.4.2,<=2.5 - cudf=23.08.* @@ -135,7 +164,7 @@ dependencies: - pydeck>=0.3,<=0.5.0 - pyppeteer>=0.2.6 - pyproj>=2.4,<=3.4 - - output_types: conda + - output_types: [conda, pyproject] packages: - cupy>=12.0.0 - output_types: requirements @@ -143,7 +172,7 @@ dependencies: - cupy-cuda11x>=12.0.0 test_python: common: - - output_types: [conda, requirements] + - output_types: [conda, requirements, pyproject] packages: - pytest - pytest-cov diff --git a/python/pyproject.toml b/python/pyproject.toml index 95fa9044..f778d1d8 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -2,7 +2,10 @@ [build-system] build-backend = "setuptools.build_meta" -requires = [] +requires = [ + "setuptools", + "wheel", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`. [project] name = "cuxfilter" @@ -14,7 +17,27 @@ authors = [ ] license = { text = "Apache 2.0" } requires-python = ">=3.9" -dependencies = [] +dependencies = [ + "bokeh>=2.4.2,<=2.5", + "cudf=23.08.*", + "cupy>=12.0.0", + "cuspatial=23.08.*", + "dask-cuda=23.08.*", + "dask-cudf=23.08.*", + "datashader>=0.15", + "geopandas>=0.11.0", + "holoviews>=1.15.0,<=1.15.4", + "jupyter-server-proxy", + "libwebp", + "nodejs>=14", + "numba>=0.57", + "numpy>=1.21", + "packaging", + "panel >=0.14.0,<=0.14.1", + "pydeck>=0.3,<=0.5.0", + "pyppeteer>=0.2.6", + "pyproj>=2.4,<=3.4", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers", "Topic :: Database", @@ -26,7 +49,10 @@ classifiers = [ ] [project.optional-dependencies] -test = [] +test = [ + "pytest", + "pytest-cov", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`. [project.urls] Homepage = "https://github.com/rapidsai/cuxfilter" From ab01fd36c6761048392b43aa2e5271302e4f64b7 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 12:26:45 -0700 Subject: [PATCH 35/56] version conditions in pep508 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 10 +++++----- conda/environments/all_cuda-120_arch-x86_64.yaml | 12 ++++++------ dependencies.yaml | 10 +++++----- python/pyproject.toml | 10 +++++----- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 97e2245a..5fb831d9 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -9,12 +9,12 @@ dependencies: - bokeh>=2.4.2,<=2.5 - cuda-version=11.8 - cudatoolkit -- cudf=23.08.* -- cugraph=23.08.* +- cudf==23.08.* +- cugraph==23.08.* - cupy>=12.0.0 -- cuspatial=23.08.* -- dask-cuda=23.08.* -- dask-cudf=23.08.* +- cuspatial==23.08.* +- dask-cuda==23.08.* +- dask-cudf==23.08.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index ff789ca7..56048a3b 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -8,12 +8,12 @@ channels: dependencies: - bokeh>=2.4.2,<=2.5 - cuda-version=12.0 -- cudf=23.08.* -- cugraph=23.08.* +- cudf==23.08.* +- cugraph==23.08.* - cupy>=12.0.0 -- cuspatial=23.08.* -- dask-cuda=23.08.* -- dask-cudf=23.08.* +- cuspatial==23.08.* +- dask-cuda==23.08.* +- dask-cudf==23.08.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 @@ -29,7 +29,7 @@ dependencies: - numpydoc - packaging - pandoc<=2.0.0 -- panel >=0.14.0,<=0.14.1 +- panel>=0.14.0,<=0.14.1 - pre-commit - pydata-sphinx-theme - pydeck>=0.3,<=0.5.0 diff --git a/dependencies.yaml b/dependencies.yaml index 2ac16df0..017967c8 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -126,7 +126,7 @@ dependencies: - notebook>=0.5.0 - output_types: [conda] packages: - - cugraph=23.08.* + - cugraph==23.08.* py_version: specific: - output_types: conda @@ -147,10 +147,10 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - bokeh>=2.4.2,<=2.5 - - cudf=23.08.* - - cuspatial=23.08.* - - dask-cuda=23.08.* - - dask-cudf=23.08.* + - cudf==23.08.* + - cuspatial==23.08.* + - dask-cuda==23.08.* + - dask-cudf==23.08.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 diff --git a/python/pyproject.toml b/python/pyproject.toml index f778d1d8..5726159e 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -19,11 +19,11 @@ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ "bokeh>=2.4.2,<=2.5", - "cudf=23.08.*", + "cudf==23.08.*", "cupy>=12.0.0", - "cuspatial=23.08.*", - "dask-cuda=23.08.*", - "dask-cudf=23.08.*", + "cuspatial==23.08.*", + "dask-cuda==23.08.*", + "dask-cudf==23.08.*", "datashader>=0.15", "geopandas>=0.11.0", "holoviews>=1.15.0,<=1.15.4", @@ -33,7 +33,7 @@ dependencies = [ "numba>=0.57", "numpy>=1.21", "packaging", - "panel >=0.14.0,<=0.14.1", + "panel>=0.14.0,<=0.14.1", "pydeck>=0.3,<=0.5.0", "pyppeteer>=0.2.6", "pyproj>=2.4,<=3.4", From aab4898d0a1555180242898f376d79935bdbda22 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 12:57:42 -0700 Subject: [PATCH 36/56] rm manifest and _version --- python/MANIFEST.in | 2 - python/cuxfilter/_version.py | 566 ----------------------------------- 2 files changed, 568 deletions(-) delete mode 100644 python/MANIFEST.in delete mode 100644 python/cuxfilter/_version.py diff --git a/python/MANIFEST.in b/python/MANIFEST.in deleted file mode 100644 index 5d82efee..00000000 --- a/python/MANIFEST.in +++ /dev/null @@ -1,2 +0,0 @@ -include versioneer.py -include cuxfilter/_version.py diff --git a/python/cuxfilter/_version.py b/python/cuxfilter/_version.py deleted file mode 100644 index 50d01a62..00000000 --- a/python/cuxfilter/_version.py +++ /dev/null @@ -1,566 +0,0 @@ -# This file helps to compute a version number in source trees obtained from -# git-archive tarball (such as those provided by githubs download-from-tag -# feature). Distribution tarballs (built by setup.py sdist) and build -# directories (produced by setup.py build) will contain a much shorter file -# that just contains the computed version number. - -# This file is released into the public domain. Generated by -# versioneer-0.18 (https://github.com/warner/python-versioneer) - -"""Git implementation of _version.py.""" - -import errno -import os -import re -import subprocess -import sys - - -def get_keywords(): - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must - # each be defined on a line of their own. _version.py will just call - # get_keywords(). - git_refnames = "$Format:%d$" - git_full = "$Format:%H$" - git_date = "$Format:%ci$" - keywords = {"refnames": git_refnames, "full": git_full, "date": git_date} - return keywords - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_config(): - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py - cfg = VersioneerConfig() - cfg.VCS = "git" - cfg.style = "pep440" - cfg.tag_prefix = "v" - cfg.parentdir_prefix = "cuxfilter-" - cfg.versionfile_source = "cuxfilter/_version.py" - cfg.verbose = False - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - - return decorate - - -def run_command( - commands, args, cwd=None, verbose=False, hide_stderr=False, env=None -): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen( - [c] + args, - cwd=cwd, - env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr else None), - ) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %s" % dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %s" % (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) - return None, p.returncode - return stdout, p.returncode - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return { - "version": dirname[len(parentdir_prefix) :], - "full-revisionid": None, - "dirty": False, - "error": None, - "date": None, - } - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print( - "Tried directories %s but none started with prefix %s" - % (str(rootdirs), parentdir_prefix) - ) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG) :] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r"\d", r)]) - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: - print("likely tags: %s" % ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix) :] - if verbose: - print("picking %s" % r) - return { - "version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, - "error": None, - "date": date, - } - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return { - "version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, - "error": "no suitable tags", - "date": None, - } - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command( - GITS, ["rev-parse", "--git-dir"], cwd=root, hide_stderr=True - ) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command( - GITS, - [ - "describe", - "--tags", - "--dirty", - "--always", - "--long", - "--match", - "%s*" % tag_prefix, - ], - cwd=root, - ) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[: git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ( - "unable to parse git-describe output: '%s'" % describe_out - ) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) - pieces["error"] = "tag '%s' doesn't start with prefix '%s'" % ( - full_tag, - tag_prefix, - ) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix) :] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command( - GITS, ["rev-list", "HEAD", "--count"], cwd=root - ) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], cwd=root)[ - 0 - ].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%d" % pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%d" % pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%s" % pieces["short"] - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%s" % pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return { - "version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None, - } - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%s'" % style) - - return { - "version": rendered, - "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], - "error": None, - "date": pieces.get("date"), - } - - -def get_versions(): - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some - # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which - # case we can only use expanded keywords. - - cfg = get_config() - verbose = cfg.verbose - - try: - return git_versions_from_keywords( - get_keywords(), cfg.tag_prefix, verbose - ) - except NotThisMethod: - pass - - try: - root = os.path.realpath(__file__) - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. - for i in cfg.versionfile_source.split("/"): - root = os.path.dirname(root) - except NameError: - return { - "version": "0+unknown", - "full-revisionid": None, - "dirty": None, - "error": "unable to find root of source tree", - "date": None, - } - - try: - pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose) - return render(pieces, cfg.style) - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - return versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - except NotThisMethod: - pass - - return { - "version": "0+unknown", - "full-revisionid": None, - "dirty": None, - "error": "unable to compute version", - "date": None, - } From 0753fc3e8e64b1afec47d129f5bdf70c7c9ad086 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 13:01:12 -0700 Subject: [PATCH 37/56] fix versions --- ci/release/update-version.sh | 3 +++ python/cuxfilter/__init__.py | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index acb1ac9d..4710d4e8 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -37,6 +37,9 @@ function sed_runner() { sed_runner 's/version = .*/version = '"'${NEXT_SHORT_TAG}'"'/g' docs/source/conf.py sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/source/conf.py +# Python __init__.py updates +sed_runner "s/__version__ = .*/__version__ = \"${NEXT_FULL_TAG}\"/g" python/cuxfilter/__init__.py + DEPENDENCIES=( cudf dask-cuda diff --git a/python/cuxfilter/__init__.py b/python/cuxfilter/__init__.py index f91290c8..09604267 100644 --- a/python/cuxfilter/__init__.py +++ b/python/cuxfilter/__init__.py @@ -1,6 +1,4 @@ from cuxfilter.dataframe import DataFrame from cuxfilter.dashboard import DashBoard -from ._version import get_versions -__version__ = get_versions()["version"] -del get_versions +__version__ = "23.08.00" \ No newline at end of file From 01b9c4b512e7abf05a5c8b50a0fbf5419ef1ef79 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Fri, 7 Jul 2023 13:04:23 -0700 Subject: [PATCH 38/56] add newline at end --- python/cuxfilter/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cuxfilter/__init__.py b/python/cuxfilter/__init__.py index 09604267..5f1444aa 100644 --- a/python/cuxfilter/__init__.py +++ b/python/cuxfilter/__init__.py @@ -1,4 +1,4 @@ from cuxfilter.dataframe import DataFrame from cuxfilter.dashboard import DashBoard -__version__ = "23.08.00" \ No newline at end of file +__version__ = "23.08.00" From 4ac9db1190e8da0c9f1bc535bfd7c5c2010693a8 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 10:47:13 -0700 Subject: [PATCH 39/56] fix dependencies --- dependencies.yaml | 7 +++++-- python/pyproject.toml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 017967c8..88652d21 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -164,12 +164,15 @@ dependencies: - pydeck>=0.3,<=0.5.0 - pyppeteer>=0.2.6 - pyproj>=2.4,<=3.4 - - output_types: [conda, pyproject] + - output_types: conda packages: - cupy>=12.0.0 - output_types: requirements packages: - - cupy-cuda11x>=12.0.0 + - &cupy_pip cupy-cuda11x>=12.0.0 + - output_types: pyproject + packages: + - *cupy_pip test_python: common: - output_types: [conda, requirements, pyproject] diff --git a/python/pyproject.toml b/python/pyproject.toml index 5726159e..f6852a6d 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -20,7 +20,7 @@ requires-python = ">=3.9" dependencies = [ "bokeh>=2.4.2,<=2.5", "cudf==23.08.*", - "cupy>=12.0.0", + "cupy-cuda11x>=12.0.0", "cuspatial==23.08.*", "dask-cuda==23.08.*", "dask-cudf==23.08.*", From ca1919c5a0d51c43940ee43b46c2dbabf9f6f08c Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 10:47:50 -0700 Subject: [PATCH 40/56] wheels for CUDA 12 use cupy-cuda12x --- ci/release/apply_wheel_modifications.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/apply_wheel_modifications.sh b/ci/release/apply_wheel_modifications.sh index fa4b6a4a..2443a242 100755 --- a/ci/release/apply_wheel_modifications.sh +++ b/ci/release/apply_wheel_modifications.sh @@ -19,5 +19,5 @@ sed -i "s/\"dask-cudf==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml if [[ $CUDA_SUFFIX == "-cu12" ]]; then sed -i "s/numba[<=>\.,0-9]*/numba>=0.57/g" python/pyproject.toml - sed -i "s/cuda-python[<=>\.,0-9]*/cuda-python>=12.0,<13.0/g" python/pyproject.toml + sed -i "s/cupy-cuda11x/cupy-cuda12x/g" python/pyproject.toml fi \ No newline at end of file From 991719cd074ff9119fa46f913350fb77c5f628cc Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 10:50:20 -0700 Subject: [PATCH 41/56] fix modification scripts for typos --- ci/release/apply_wheel_modifications.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/release/apply_wheel_modifications.sh b/ci/release/apply_wheel_modifications.sh index 2443a242..4e29540c 100755 --- a/ci/release/apply_wheel_modifications.sh +++ b/ci/release/apply_wheel_modifications.sh @@ -13,9 +13,9 @@ sed -i "s/^version = .*/version = \"${VERSION}\"/g" python/pyproject.toml sed -i "s/^name = \"cuxfilter\"/name = \"cuxfilter${CUDA_SUFFIX}\"/g" python/pyproject.toml # Need to provide the == to avoid modifying the URL sed -i "s/\"cudf==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml -sed -i "s/\"cuspatial==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml -sed -i "s/\"dask-cuda==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml -sed -i "s/\"dask-cudf==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml +sed -i "s/\"cuspatial==/\"cuspatial${CUDA_SUFFIX}==/g" python/pyproject.toml +sed -i "s/\"dask-cuda==/\"dask-cuda${CUDA_SUFFIX}==/g" python/pyproject.toml +sed -i "s/\"dask-cudf==/\"dask-cudf${CUDA_SUFFIX}==/g" python/pyproject.toml if [[ $CUDA_SUFFIX == "-cu12" ]]; then sed -i "s/numba[<=>\.,0-9]*/numba>=0.57/g" python/pyproject.toml From 0dd47557622e3a76086207e5b7981cfb6d69a263 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 11:01:33 -0700 Subject: [PATCH 42/56] Merge branch 'branch-23.08' of github.com:rapidsai/cuxfilter into add-pip-wheels --- conda/environments/all_cuda-118_arch-x86_64.yaml | 10 +++++----- conda/environments/all_cuda-120_arch-x86_64.yaml | 10 +++++----- conda/recipes/cuxfilter/meta.yaml | 1 + dependencies.yaml | 10 +++++----- python/pyproject.toml | 8 ++++---- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 5fb831d9..d0b2a37d 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -9,12 +9,12 @@ dependencies: - bokeh>=2.4.2,<=2.5 - cuda-version=11.8 - cudatoolkit -- cudf==23.08.* -- cugraph==23.08.* +- cudf==23.8.* +- cugraph==23.8.* - cupy>=12.0.0 -- cuspatial==23.08.* -- dask-cuda==23.08.* -- dask-cudf==23.08.* +- cuspatial==23.8.* +- dask-cuda==23.8.* +- dask-cudf==23.8.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index 56048a3b..7f58f52c 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -8,12 +8,12 @@ channels: dependencies: - bokeh>=2.4.2,<=2.5 - cuda-version=12.0 -- cudf==23.08.* -- cugraph==23.08.* +- cudf==23.8.* +- cugraph==23.8.* - cupy>=12.0.0 -- cuspatial==23.08.* -- dask-cuda==23.08.* -- dask-cudf==23.08.* +- cuspatial==23.8.* +- dask-cuda==23.8.* +- dask-cudf==23.8.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml index 948c447a..2c3035f2 100644 --- a/conda/recipes/cuxfilter/meta.yaml +++ b/conda/recipes/cuxfilter/meta.yaml @@ -1,6 +1,7 @@ # Copyright (c) 2018-2023, NVIDIA CORPORATION. {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %} +{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %} {% set cuda_major = cuda_version.split('.')[0] %} {% set py_version = environ['CONDA_PY'] %} diff --git a/dependencies.yaml b/dependencies.yaml index 88652d21..3fad7bc3 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -126,7 +126,7 @@ dependencies: - notebook>=0.5.0 - output_types: [conda] packages: - - cugraph==23.08.* + - cugraph==23.8.* py_version: specific: - output_types: conda @@ -147,10 +147,10 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - bokeh>=2.4.2,<=2.5 - - cudf==23.08.* - - cuspatial==23.08.* - - dask-cuda==23.08.* - - dask-cudf==23.08.* + - cudf==23.8.* + - cuspatial==23.8.* + - dask-cuda==23.8.* + - dask-cudf==23.8.* - datashader>=0.15 - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 diff --git a/python/pyproject.toml b/python/pyproject.toml index f6852a6d..19b1579c 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -19,11 +19,11 @@ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ "bokeh>=2.4.2,<=2.5", - "cudf==23.08.*", + "cudf==23.8.*", "cupy-cuda11x>=12.0.0", - "cuspatial==23.08.*", - "dask-cuda==23.08.*", - "dask-cudf==23.08.*", + "cuspatial==23.8.*", + "dask-cuda==23.8.*", + "dask-cudf==23.8.*", "datashader>=0.15", "geopandas>=0.11.0", "holoviews>=1.15.0,<=1.15.4", From 3a674f32cb075ecb3de3569dffd099533fc9abc3 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 12:04:22 -0700 Subject: [PATCH 43/56] use wheels-pure workflows for pure python builds --- .github/workflows/build.yaml | 4 ++-- .github/workflows/pr.yaml | 4 ++-- .github/workflows/test.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 414c13c9..c11b8994 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -59,7 +59,7 @@ jobs: sha: ${{ inputs.sha }} wheel-build: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-build.yml@cuda-120 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -70,7 +70,7 @@ jobs: wheel-publish: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-publish.yml@cuda-120 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 2a0ee13a..c98be173 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -60,7 +60,7 @@ jobs: wheel-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-build.yml@cuda-120 with: build_type: pull-request package-name: cuxfilter @@ -68,7 +68,7 @@ jobs: wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-test.yml@cuda-120 with: build_type: pull-request package-name: cuxfilter diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index dfd8a80b..ab4a7908 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -25,7 +25,7 @@ jobs: wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-test.yml@cuda-120 with: build_type: pull-request package-name: cuxfilter From 67a2697729496189afa67c3e63b97687e890c45c Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 12:11:56 -0700 Subject: [PATCH 44/56] remove incorrect input --- .github/workflows/pr.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c98be173..131401b0 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -73,4 +73,3 @@ jobs: build_type: pull-request package-name: cuxfilter test-unittest: "python -m pytest -n 8 ./python/cuxfilter/tests" - test-smoketest: "python ./ci/wheel_smoke_test.py" From b517de1d28c96608c6edbd8776d416c2749ff638 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 13:41:35 -0700 Subject: [PATCH 45/56] Update .github/workflows/build.yaml Co-authored-by: Bradley Dice --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c11b8994..c7e9f68f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -65,7 +65,7 @@ jobs: branch: ${{ inputs.branch }} sha: ${{ inputs.sha }} date: ${{ inputs.date }} - package-name: cudf + package-name: cuxfilter package-dir: python/cuxfilter wheel-publish: needs: wheel-build From 940230e77577e53b821e2e87acb131c2fa571f22 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 13:41:42 -0700 Subject: [PATCH 46/56] Update .github/workflows/build.yaml Co-authored-by: Bradley Dice --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c7e9f68f..8e60f788 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -66,7 +66,7 @@ jobs: sha: ${{ inputs.sha }} date: ${{ inputs.date }} package-name: cuxfilter - package-dir: python/cuxfilter + package-dir: python/ wheel-publish: needs: wheel-build secrets: inherit From 7543e17263cb53c78c11b007c81de1978bcc3256 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 13:52:11 -0700 Subject: [PATCH 47/56] Update .github/workflows/pr.yaml Co-authored-by: Bradley Dice --- .github/workflows/pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 131401b0..e8943256 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -64,7 +64,7 @@ jobs: with: build_type: pull-request package-name: cuxfilter - package-dir: python + package-dir: python/ wheel-tests: needs: wheel-build secrets: inherit From b41d1d4a2deba87fe52beacccaec157e23d963bd Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 14:32:48 -0700 Subject: [PATCH 48/56] Update .flake8 Co-authored-by: Bradley Dice --- .flake8 | 1 - 1 file changed, 1 deletion(-) diff --git a/.flake8 b/.flake8 index 0494ee99..cb6aee8f 100644 --- a/.flake8 +++ b/.flake8 @@ -3,7 +3,6 @@ [flake8] filename = *.py, exclude = __init__.py, *.egg, build, docs, .git -force-check = True ignore = # line break before binary operator W503, From 3e4526511adc85914c4b254f15a4adc07ba182be Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 14:45:14 -0700 Subject: [PATCH 49/56] undo version usage, and use minor_version --- conda/recipes/cuxfilter/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml index 2c3035f2..ba09730a 100644 --- a/conda/recipes/cuxfilter/meta.yaml +++ b/conda/recipes/cuxfilter/meta.yaml @@ -25,11 +25,11 @@ requirements: - cuda-version ={{ cuda_version }} run: - bokeh >=2.4.2,<=2.5 - - cudf ={{ version }} + - cudf ={{ minor_version }} - cupy >=12.0.0 - - cuspatial ={{ version }} - - dask-cuda ={{ version }} - - dask-cudf ={{ version }} + - cuspatial ={{ minor_version }} + - dask-cuda ={{ minor_version }} + - dask-cudf ={{ minor_version }} - datashader >=0.15 - geopandas >=0.11.0 - holoviews>=1.15.0,<=1.15.4 From ccbd94d8f03b00292381a09fccadee5ec4537355 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 14:49:06 -0700 Subject: [PATCH 50/56] Apply suggestions from code review Co-authored-by: Bradley Dice --- .pre-commit-config.yaml | 3 --- ci/release/apply_wheel_modifications.sh | 1 - python/cuxfilter/__init__.py | 2 ++ python/setup.py | 2 ++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index af7e646b..bcad2472 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,9 +14,6 @@ repos: - id: flake8 args: ["--config=.flake8"] files: python/.*$ - types: [file] - types_or: [python, cython] - additional_dependencies: ["flake8-force"] - repo: https://github.com/rapidsai/dependency-file-generator rev: v1.5.2 hooks: diff --git a/ci/release/apply_wheel_modifications.sh b/ci/release/apply_wheel_modifications.sh index 4e29540c..cf3d3996 100755 --- a/ci/release/apply_wheel_modifications.sh +++ b/ci/release/apply_wheel_modifications.sh @@ -18,6 +18,5 @@ sed -i "s/\"dask-cuda==/\"dask-cuda${CUDA_SUFFIX}==/g" python/pyproject.toml sed -i "s/\"dask-cudf==/\"dask-cudf${CUDA_SUFFIX}==/g" python/pyproject.toml if [[ $CUDA_SUFFIX == "-cu12" ]]; then - sed -i "s/numba[<=>\.,0-9]*/numba>=0.57/g" python/pyproject.toml sed -i "s/cupy-cuda11x/cupy-cuda12x/g" python/pyproject.toml fi \ No newline at end of file diff --git a/python/cuxfilter/__init__.py b/python/cuxfilter/__init__.py index 5f1444aa..c1919c5a 100644 --- a/python/cuxfilter/__init__.py +++ b/python/cuxfilter/__init__.py @@ -1,3 +1,5 @@ +# Copyright (c) 2019-2023, NVIDIA CORPORATION. + from cuxfilter.dataframe import DataFrame from cuxfilter.dashboard import DashBoard diff --git a/python/setup.py b/python/setup.py index 951b8247..a4f81031 100644 --- a/python/setup.py +++ b/python/setup.py @@ -1,3 +1,5 @@ +# Copyright (c) 2019-2023, NVIDIA CORPORATION. + from setuptools import find_packages, setup setup( From 8c3556c004fe847abfb6f6a4717c0809f26d5e90 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 14:51:26 -0700 Subject: [PATCH 51/56] fix dependencies --- dependencies.yaml | 11 ++++------- python/pyproject.toml | 2 -- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 3fad7bc3..472bdde3 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -155,8 +155,6 @@ dependencies: - geopandas>=0.11.0 - holoviews>=1.15.0,<=1.15.4 - jupyter-server-proxy - - libwebp - - nodejs>=14 - numba>=0.57 - numpy>=1.21 - packaging @@ -167,12 +165,11 @@ dependencies: - output_types: conda packages: - cupy>=12.0.0 - - output_types: requirements - packages: - - &cupy_pip cupy-cuda11x>=12.0.0 - - output_types: pyproject + - nodejs>=14 + - libwebp + - output_types: [requirements, pyproject] packages: - - *cupy_pip + - cupy-cuda11x>=12.0.0 test_python: common: - output_types: [conda, requirements, pyproject] diff --git a/python/pyproject.toml b/python/pyproject.toml index 19b1579c..0befdb55 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -28,8 +28,6 @@ dependencies = [ "geopandas>=0.11.0", "holoviews>=1.15.0,<=1.15.4", "jupyter-server-proxy", - "libwebp", - "nodejs>=14", "numba>=0.57", "numpy>=1.21", "packaging", From ad01bada2dc156399952fce3eb8a7393f1c7d2aa Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 15:04:43 -0700 Subject: [PATCH 52/56] update versions, using `pre-commit autoupdate` --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bcad2472..9287ee0b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,14 +2,14 @@ repos: - repo: https://github.com/psf/black - rev: 22.3.0 + rev: 23.7.0 hooks: - id: black files: python/cuxfilter/.* # Explicitly specify the pyproject.toml at the repo root, not per-project. args: ["--config", "pyproject.toml"] - repo: https://github.com/PyCQA/flake8 - rev: 5.0.4 + rev: 6.0.0 hooks: - id: flake8 args: ["--config=.flake8"] From d5c393e1e35af045284d618f62c1097d1e33ffb9 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 11 Jul 2023 15:04:59 -0700 Subject: [PATCH 53/56] run updated black --- python/cuxfilter/charts/core/non_aggregate/core_non_aggregate.py | 1 + python/cuxfilter/charts/datashader/datashader.py | 1 - python/cuxfilter/charts/deckgl/plots.py | 1 - python/cuxfilter/sampledata/download_datasets.py | 1 - python/cuxfilter/tests/test_dashboard.py | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/python/cuxfilter/charts/core/non_aggregate/core_non_aggregate.py b/python/cuxfilter/charts/core/non_aggregate/core_non_aggregate.py index f41ec90a..0ea51fb1 100644 --- a/python/cuxfilter/charts/core/non_aggregate/core_non_aggregate.py +++ b/python/cuxfilter/charts/core/non_aggregate/core_non_aggregate.py @@ -213,6 +213,7 @@ def add_reset_event(self, dashboard_cls): Ouput: """ + # def reset_callback(): def reset_callback(resetting): self.selected_indices = None diff --git a/python/cuxfilter/charts/datashader/datashader.py b/python/cuxfilter/charts/datashader/datashader.py index ee0dab96..388acd8f 100644 --- a/python/cuxfilter/charts/datashader/datashader.py +++ b/python/cuxfilter/charts/datashader/datashader.py @@ -171,7 +171,6 @@ def graph( unselected_alpha=0.2, **library_specific_params, ): - """ Parameters ---------- diff --git a/python/cuxfilter/charts/deckgl/plots.py b/python/cuxfilter/charts/deckgl/plots.py index 04e33767..f1acd4c8 100644 --- a/python/cuxfilter/charts/deckgl/plots.py +++ b/python/cuxfilter/charts/deckgl/plots.py @@ -10,7 +10,6 @@ class Choropleth(BaseChoropleth): - debug = False # reset event handling not required, as the default behavior # unselects all selected points, and that is already taken care of diff --git a/python/cuxfilter/sampledata/download_datasets.py b/python/cuxfilter/sampledata/download_datasets.py index 94f02e3d..f1d975dc 100644 --- a/python/cuxfilter/sampledata/download_datasets.py +++ b/python/cuxfilter/sampledata/download_datasets.py @@ -75,7 +75,6 @@ def download_dataset(downloaded_filename, filename, url, base_dir): def datasets_check(*args, base_dir="./"): - dir_name = base_dir check_folder(dir_name) diff --git a/python/cuxfilter/tests/test_dashboard.py b/python/cuxfilter/tests/test_dashboard.py index a8027fc1..3421fc33 100644 --- a/python/cuxfilter/tests/test_dashboard.py +++ b/python/cuxfilter/tests/test_dashboard.py @@ -6,7 +6,6 @@ class TestDashBoard: - df = cudf.DataFrame( {"key": [0, 1, 2, 3, 4], "val": [float(i + 10) for i in range(5)]} ) From 26e471274df66ee795877709c578ba170efd580d Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Wed, 12 Jul 2023 09:49:10 -0700 Subject: [PATCH 54/56] install dask-cuda from source --- .github/workflows/pr.yaml | 2 ++ .github/workflows/test.yaml | 2 ++ ci/release/apply_wheel_modifications.sh | 2 +- ci/release/update-version.sh | 5 ++++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index e8943256..9dc72103 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -72,4 +72,6 @@ jobs: with: build_type: pull-request package-name: cuxfilter + # dask-cuda has to install from source because it is not yet released on PyPI. + test-before: "python -m pip install git+https://github.com/rapidsai/dask-cuda.git@branch-23.08" test-unittest: "python -m pytest -n 8 ./python/cuxfilter/tests" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ab4a7908..c0cec5f0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -29,4 +29,6 @@ jobs: with: build_type: pull-request package-name: cuxfilter + # dask-cuda has to install from source because it is not yet released on PyPI. + test-before: "python -m pip install git+https://github.com/rapidsai/dask-cuda.git@branch-23.08" test-unittest: "python -m pytest -n 8 ./python/cuxfilter/tests" diff --git a/ci/release/apply_wheel_modifications.sh b/ci/release/apply_wheel_modifications.sh index cf3d3996..ae24334d 100755 --- a/ci/release/apply_wheel_modifications.sh +++ b/ci/release/apply_wheel_modifications.sh @@ -19,4 +19,4 @@ sed -i "s/\"dask-cudf==/\"dask-cudf${CUDA_SUFFIX}==/g" python/pyproject.toml if [[ $CUDA_SUFFIX == "-cu12" ]]; then sed -i "s/cupy-cuda11x/cupy-cuda12x/g" python/pyproject.toml -fi \ No newline at end of file +fi diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 4710d4e8..92322da8 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -60,7 +60,10 @@ sed_runner "s/cuxfilter=${CURRENT_SHORT_TAG}/cuxfilter=${NEXT_SHORT_TAG}/g" READ # CI files for FILE in .github/workflows/*.yaml; do - sed_runner "/shared-action-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}" + sed_runner "/shared-action-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" ${FILE}; + # temporary fix for dask-cuda install, until we have a PyPI release for it + sed_runner "s/dask-cuda.git@branch-[^\"\s]\+/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" ${FILE}; done + sed_runner "s/RAPIDS_VERSION_NUMBER=\".*/RAPIDS_VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh sed_runner "s/RAPIDS_VERSION=.*/RAPIDS_VERSION=${NEXT_SHORT_TAG}.*/g" ci/test_external.sh From 6574a6cbdb89e33f261be71a85b9cb973682adfa Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Wed, 12 Jul 2023 10:22:20 -0700 Subject: [PATCH 55/56] remove dask-cuda as a direct dependency, since it's only required for dask_notebooks --- .github/workflows/pr.yaml | 2 -- .github/workflows/test.yaml | 2 -- ci/release/apply_wheel_modifications.sh | 1 - ci/release/update-version.sh | 2 -- conda/recipes/cuxfilter/meta.yaml | 1 - dependencies.yaml | 2 +- python/pyproject.toml | 1 - 7 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 9dc72103..e8943256 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -72,6 +72,4 @@ jobs: with: build_type: pull-request package-name: cuxfilter - # dask-cuda has to install from source because it is not yet released on PyPI. - test-before: "python -m pip install git+https://github.com/rapidsai/dask-cuda.git@branch-23.08" test-unittest: "python -m pytest -n 8 ./python/cuxfilter/tests" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c0cec5f0..ab4a7908 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -29,6 +29,4 @@ jobs: with: build_type: pull-request package-name: cuxfilter - # dask-cuda has to install from source because it is not yet released on PyPI. - test-before: "python -m pip install git+https://github.com/rapidsai/dask-cuda.git@branch-23.08" test-unittest: "python -m pytest -n 8 ./python/cuxfilter/tests" diff --git a/ci/release/apply_wheel_modifications.sh b/ci/release/apply_wheel_modifications.sh index ae24334d..4af9765b 100755 --- a/ci/release/apply_wheel_modifications.sh +++ b/ci/release/apply_wheel_modifications.sh @@ -14,7 +14,6 @@ sed -i "s/^name = \"cuxfilter\"/name = \"cuxfilter${CUDA_SUFFIX}\"/g" python/pyp # Need to provide the == to avoid modifying the URL sed -i "s/\"cudf==/\"cudf${CUDA_SUFFIX}==/g" python/pyproject.toml sed -i "s/\"cuspatial==/\"cuspatial${CUDA_SUFFIX}==/g" python/pyproject.toml -sed -i "s/\"dask-cuda==/\"dask-cuda${CUDA_SUFFIX}==/g" python/pyproject.toml sed -i "s/\"dask-cudf==/\"dask-cudf${CUDA_SUFFIX}==/g" python/pyproject.toml if [[ $CUDA_SUFFIX == "-cu12" ]]; then diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 92322da8..697620f6 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -61,8 +61,6 @@ sed_runner "s/cuxfilter=${CURRENT_SHORT_TAG}/cuxfilter=${NEXT_SHORT_TAG}/g" READ # CI files for FILE in .github/workflows/*.yaml; do sed_runner "/shared-action-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" ${FILE}; - # temporary fix for dask-cuda install, until we have a PyPI release for it - sed_runner "s/dask-cuda.git@branch-[^\"\s]\+/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" ${FILE}; done sed_runner "s/RAPIDS_VERSION_NUMBER=\".*/RAPIDS_VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml index ba09730a..82400847 100644 --- a/conda/recipes/cuxfilter/meta.yaml +++ b/conda/recipes/cuxfilter/meta.yaml @@ -28,7 +28,6 @@ requirements: - cudf ={{ minor_version }} - cupy >=12.0.0 - cuspatial ={{ minor_version }} - - dask-cuda ={{ minor_version }} - dask-cudf ={{ minor_version }} - datashader >=0.15 - geopandas >=0.11.0 diff --git a/dependencies.yaml b/dependencies.yaml index 472bdde3..fc2c5589 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -127,6 +127,7 @@ dependencies: - output_types: [conda] packages: - cugraph==23.8.* + - dask-cuda==23.8.* py_version: specific: - output_types: conda @@ -149,7 +150,6 @@ dependencies: - bokeh>=2.4.2,<=2.5 - cudf==23.8.* - cuspatial==23.8.* - - dask-cuda==23.8.* - dask-cudf==23.8.* - datashader>=0.15 - geopandas>=0.11.0 diff --git a/python/pyproject.toml b/python/pyproject.toml index 0befdb55..70a76a35 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -22,7 +22,6 @@ dependencies = [ "cudf==23.8.*", "cupy-cuda11x>=12.0.0", "cuspatial==23.8.*", - "dask-cuda==23.8.*", "dask-cudf==23.8.*", "datashader>=0.15", "geopandas>=0.11.0", From a1558015b9ab4a4c39ca0fe2ca9bd820b8da65b9 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Wed, 12 Jul 2023 10:58:34 -0700 Subject: [PATCH 56/56] use pytest-xdist extension --- ci/test_python.sh | 1 + conda/environments/all_cuda-118_arch-x86_64.yaml | 1 + conda/environments/all_cuda-120_arch-x86_64.yaml | 1 + dependencies.yaml | 2 ++ python/pyproject.toml | 1 + 5 files changed, 6 insertions(+) diff --git a/ci/test_python.sh b/ci/test_python.sh index c6ea1c05..af505feb 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -43,6 +43,7 @@ pushd python/ pytest \ --cache-clear \ --junitxml="${RAPIDS_TESTS_DIR}/junit-cuxfilter.xml" \ + --numprocesses=8 \ --cov-config=.coveragerc \ --cov=cuxfilter \ --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cuxfilter-coverage.xml" \ diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index d0b2a37d..342f8a83 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -38,6 +38,7 @@ dependencies: - pyproj>=2.4,<=3.4 - pytest - pytest-cov +- pytest-xdist - python>=3.9,<3.11 - recommonmark - sphinx diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index 7f58f52c..77a12ea0 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -37,6 +37,7 @@ dependencies: - pyproj>=2.4,<=3.4 - pytest - pytest-cov +- pytest-xdist - python>=3.9,<3.11 - recommonmark - sphinx diff --git a/dependencies.yaml b/dependencies.yaml index fc2c5589..2faa4ac4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -176,3 +176,5 @@ dependencies: packages: - pytest - pytest-cov + - pytest-xdist + diff --git a/python/pyproject.toml b/python/pyproject.toml index 70a76a35..fd9d1588 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -49,6 +49,7 @@ classifiers = [ test = [ "pytest", "pytest-cov", + "pytest-xdist", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`. [project.urls]