diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index b4c43f38..79b31135 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -23,6 +23,11 @@ jobs: with: fetch-depth: 0 + - name: Fetch upstream tags + run: | + git remote add upstream https://github.com/dask/fastparquet.git + git fetch upstream --tags + - name: Setup conda uses: conda-incubator/setup-miniconda@v3 with: @@ -53,6 +58,11 @@ jobs: with: fetch-depth: 0 + - name: Fetch upstream tags + run: | + git remote add upstream https://github.com/dask/fastparquet.git + git fetch upstream --tags + - name: Setup conda uses: conda-incubator/setup-miniconda@v3 with: @@ -82,6 +92,11 @@ jobs: with: fetch-depth: 0 + - name: Fetch upstream tags + run: | + git remote add upstream https://github.com/dask/fastparquet.git + git fetch upstream --tags + - name: Setup conda uses: conda-incubator/setup-miniconda@v3 with: @@ -94,6 +109,7 @@ jobs: pip install hypothesis pip install pytest-localserver pytest-xdist pytest-asyncio pip install -e . --no-deps # Install fastparquet + pip install versioneer # Needed for pandas build git clone https://github.com/pandas-dev/pandas cd pandas python setup.py build_ext -j 4 @@ -117,6 +133,11 @@ jobs: with: fetch-depth: 0 + - name: Fetch upstream tags + run: | + git remote add upstream https://github.com/dask/fastparquet.git + git fetch upstream --tags + - name: Setup conda uses: conda-incubator/setup-miniconda@v3 with: diff --git a/ci/environment-py310.yml b/ci/environment-py310.yml index bf765296..4dee9657 100644 --- a/ci/environment-py310.yml +++ b/ci/environment-py310.yml @@ -18,6 +18,5 @@ dependencies: - orjson - ujson - python-rapidjson - - versioneer - meson-python - pyarrow diff --git a/pyproject.toml b/pyproject.toml index 61c1f634..84659005 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,2 +1,8 @@ [build-system] requires = ["setuptools", "setuptools_scm", "Cython >= 0.29.23", "numpy>=2.0.0rc1"] +build-backend = "setuptools.build_meta" + +[tool.setuptools_scm] +write_to = "fastparquet/_version.py" +version_scheme = "guess-next-dev" +local_scheme = "no-local-version" diff --git a/setup.cfg b/setup.cfg index 815d65f0..adfa160e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,14 +3,3 @@ test=pytest [tool:pytest] addopts = -vv - -# 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 = fastparquet/_version.py -versionfile_build = fastparquet/_version.py -tag_prefix = "" diff --git a/setup.py b/setup.py index d8799b14..5c0736ec 100644 --- a/setup.py +++ b/setup.py @@ -48,11 +48,7 @@ def fix_exts(sources): setup( name='fastparquet', - use_scm_version={ - 'version_scheme': 'guess-next-dev', - 'local_scheme': 'no-local-version', - 'write_to': 'fastparquet/_version.py' - }, + use_scm_version=True, description='Python support for Parquet file format', author='Martin Durant', author_email='mdurant@anaconda.com',