Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update action versions #918

Merged
merged 6 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test_wheel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
fetch-depth: 0

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"

Expand All @@ -50,15 +50,15 @@ jobs:

- name: Add msbuild to PATH
if: runner.os == 'Windows'
uses: microsoft/setup-msbuild@v1.3
uses: microsoft/setup-msbuild@v2

- name: delvewheel install
if: runner.os == 'Windows'
run: |
python -m pip install delvewheel cython

- name: Build wheels
uses: joerick/[email protected].2
uses: joerick/[email protected].5

- name: Install wheels
shell: bash -l {0}
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ jobs:
fetch-depth: 0

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"

- name: Set up QEMU
if: runner.os == 'Linux'
Expand All @@ -44,15 +44,15 @@ jobs:

- name: Add msbuild to PATH
if: runner.os == 'Windows'
uses: microsoft/setup-msbuild@v1
uses: microsoft/setup-msbuild@v2

- name: delvewheel install
if: runner.os == 'Windows'
run: |
python -m pip install delvewheel cython

- name: Build wheels
uses: joerick/[email protected].2
uses: joerick/[email protected].5

- uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -87,9 +87,9 @@ jobs:
fetch-depth: 0

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"

- name: Set up QEMU
if: runner.os == 'Linux'
Expand All @@ -99,15 +99,15 @@ jobs:

- name: Add msbuild to PATH
if: runner.os == 'Windows'
uses: microsoft/setup-msbuild@v1
uses: microsoft/setup-msbuild@v2

- name: delvewheel install
if: runner.os == 'Windows'
run: |
python -m pip install delvewheel cython

- name: Build wheels
uses: joerick/[email protected].2
uses: joerick/[email protected].5

- uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -142,9 +142,9 @@ jobs:
fetch-depth: 0

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"

- name: Set up QEMU
if: runner.os == 'Linux'
Expand All @@ -154,15 +154,15 @@ jobs:

- name: Add msbuild to PATH
if: runner.os == 'Windows'
uses: microsoft/setup-msbuild@v1
uses: microsoft/setup-msbuild@v2

- name: delvewheel install
if: runner.os == 'Windows'
run: |
python -m pip install delvewheel cython

- name: Build wheels
uses: joerick/[email protected].2
uses: joerick/[email protected].5

- uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -197,9 +197,9 @@ jobs:
fetch-depth: 0

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"

- name: Set up QEMU
if: runner.os == 'Linux'
Expand All @@ -209,15 +209,15 @@ jobs:

- name: Add msbuild to PATH
if: runner.os == 'Windows'
uses: microsoft/setup-msbuild@v1
uses: microsoft/setup-msbuild@v2

- name: delvewheel install
if: runner.os == 'Windows'
run: |
python -m pip install delvewheel cython

- name: Build wheels
uses: joerick/[email protected].2
uses: joerick/[email protected].5

- uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -246,12 +246,12 @@ jobs:
fetch-depth: 0

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"

- name: Build wheels
uses: joerick/[email protected].2
uses: joerick/[email protected].5

- uses: actions/upload-artifact@v3
with:
Expand Down
10 changes: 5 additions & 5 deletions fastparquet/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""parquet - read parquet files."""

from ._version import __version__
from .writer import write, update_file_custom_metadata
from . import core, schema, converted_types, api
from .api import ParquetFile
from .util import ParquetException
from fastparquet._version import __version__
from fastparquet.writer import write, update_file_custom_metadata
from fastparquet import core, schema, converted_types, api
from fastparquet.api import ParquetFile
from fastparquet.util import ParquetException

13 changes: 6 additions & 7 deletions fastparquet/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@

import numpy as np
import fsspec
from fastparquet.util import join_path
import pandas as pd

from . import core, schema, converted_types, encoding, dataframe, writer
from . import parquet_thrift
from .cencoding import ThriftObject, from_buffer
from .json import json_decoder
from .util import (default_open, default_remove, ParquetException, val_to_num,
from fastparquet import core, schema, converted_types, encoding, dataframe, writer
from fastparquet import parquet_thrift
from fastparquet.cencoding import ThriftObject, from_buffer
from fastparquet.json import json_decoder
from fastparquet.util import (default_open, default_remove, ParquetException, val_to_num,
ops, ensure_bytes, ensure_str, check_column_names, metadata_from_many,
ex_from_sep, _strip_path_tail, get_fs, PANDAS_VERSION)
ex_from_sep, _strip_path_tail, get_fs, PANDAS_VERSION, join_path)


# Find in names of partition files the integer matching "**part.*.parquet",
Expand Down
2 changes: 1 addition & 1 deletion fastparquet/compression.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

import cramjam
import numpy as np
from . import parquet_thrift
from fastparquet import parquet_thrift

# TODO: use stream/direct-to-buffer conversions instead of memcopy

Expand Down
6 changes: 3 additions & 3 deletions fastparquet/converted_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
import numpy as np
import pandas as pd

from . import parquet_thrift
from .cencoding import time_shift
from .json import json_decoder
from fastparquet import parquet_thrift
from fastparquet.cencoding import time_shift
from fastparquet.json import json_decoder

logger = logging.getLogger('parquet') # pylint: disable=invalid-name

Expand Down
19 changes: 9 additions & 10 deletions fastparquet/core.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
import warnings
import numpy as np
import pandas as pd

from . import encoding
from . encoding import read_plain
from fastparquet import encoding
from fastparquet.encoding import read_plain
import fastparquet.cencoding as encoding
from .compression import decompress_data, rev_map, decom_into
from .converted_types import convert, simple, converts_inplace
from .schema import _is_list_like, _is_map_like
from .speedups import unpack_byte_array
from . import parquet_thrift
from .cencoding import ThriftObject, read_thrift
from .util import val_to_num, ex_from_sep
from fastparquet.compression import decompress_data, rev_map, decom_into
from fastparquet.converted_types import convert, simple, converts_inplace
from fastparquet.schema import _is_list_like, _is_map_like
from fastparquet.speedups import unpack_byte_array
from fastparquet import parquet_thrift
from fastparquet.cencoding import ThriftObject
from fastparquet.util import val_to_num


def _read_page(file_obj, page_header, column_metadata):
Expand Down
2 changes: 1 addition & 1 deletion fastparquet/dataframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from pandas.core.arrays.masked import BaseMaskedDtype
import warnings

from .util import PANDAS_VERSION
from fastparquet.util import PANDAS_VERSION


class Dummy(object):
Expand Down
6 changes: 3 additions & 3 deletions fastparquet/encoding.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""encoding.py - methods for reading parquet encoded data blocks."""
import numpy as np
from .cencoding import read_bitpacked1, NumpyIO
from .speedups import unpack_byte_array
from . import parquet_thrift
from fastparquet.cencoding import read_bitpacked1, NumpyIO
from fastparquet.speedups import unpack_byte_array
from fastparquet import parquet_thrift


def read_plain_boolean(raw_bytes, count, out=None):
Expand Down
Empty file added fastparquet/evolve.py
Empty file.
2 changes: 1 addition & 1 deletion fastparquet/parquet_thrift/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

def __getattr__(name):
# for compatability with coe that calls, e.g., parquet_thrift.RowGroup(...)
from ..cencoding import ThriftObject
from fastparquet.cencoding import ThriftObject
if name[0].isupper():
return partial(ThriftObject.from_fields, thrift_name=name)
raise AttributeError(name)
2 changes: 1 addition & 1 deletion fastparquet/schema.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Utils for working with the parquet thrift models."""
from collections import OrderedDict

from . import parquet_thrift
from fastparquet import parquet_thrift


def schema_tree(schema, i=0):
Expand Down
7 changes: 5 additions & 2 deletions fastparquet/thrift_structures.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
from . import parquet_thrift
from .cencoding import ThriftObject
from fastparquet import parquet_thrift
from fastparquet.cencoding import ThriftObject


__all__ = ["ThriftObject", "parquet_thrift"]
4 changes: 2 additions & 2 deletions fastparquet/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

import fsspec

from . import parquet_thrift
from .cencoding import ThriftObject
from fastparquet import parquet_thrift
from fastparquet.cencoding import ThriftObject
from fastparquet import __version__

PANDAS_VERSION = Version(pd.__version__)
Expand Down
18 changes: 8 additions & 10 deletions fastparquet/writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,17 @@

from fastparquet.util import join_path

from . import parquet_thrift
from .api import ParquetFile, partitions, part_ids
from .compression import compress_data
from .converted_types import tobson
from .json import json_encoder
from .util import (default_open, default_mkdirs, check_column_names,
from fastparquet import parquet_thrift, __version__, cencoding
from fastparquet.api import ParquetFile, partitions, part_ids
from fastparquet.compression import compress_data
from fastparquet.converted_types import tobson
from fastparquet.json import json_encoder
from fastparquet.util import (default_open, default_mkdirs, check_column_names,
created_by, get_column_metadata,
norm_col_name, path_string, reset_row_idx, get_fs,
update_custom_metadata)
from . import __version__
from .speedups import array_encode_utf8, pack_byte_array
from . import cencoding
from .cencoding import NumpyIO, ThriftObject, from_buffer
from fastparquet.speedups import array_encode_utf8, pack_byte_array
from fastparquet.cencoding import NumpyIO, ThriftObject, from_buffer
from decimal import Decimal

MARKER = b'PAR1'
Expand Down
Loading