Skip to content

Commit

Permalink
Add support for pandas==2 (#192)
Browse files Browse the repository at this point in the history
  • Loading branch information
J535D165 committed Jul 19, 2023
1 parent 2d93cf9 commit 5cbe5c4
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10"]

python-version: ["3.8", "3.9", "3.10", "3.11"]
pandas-version: ["1.0", "2.0"]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Install pandas
run: |
pip install pandas~=${{ matrix.pandas-version }}
- name: Package recordlinkage
run: |
pip install --upgrade pip
Expand Down
9 changes: 5 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ python_files = tests/*.py recordlinkage/contrib/*_test.py

[flake8]
ignore =
C901, # too complex (fail on this in future)
E402, # module level import not at top of file
W504,W503, # line break after binary operator
I201, # Missing newline between import groups.
C901,
E402,
W504,
W503,
I201,
exclude =
docs/_build/*.py,
docs/conf.py
Expand Down
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
author="Jonathan de Bruin",
author_email="jonathandebruinhome@gmail.com",
author_email="jonathandebruinos@gmail.com",

platforms="any",

Expand All @@ -39,20 +39,20 @@
"Development Status :: 4 - Beta",
"License :: OSI Approved :: BSD License",
"Programming Language :: Python",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3 :: Only"
],

# Python version in line with pandas' python version support
# https://pandas.pydata.org/docs/getting_started/install.html
python_requires=">=3.6",
python_requires=">=3.8",
install_requires=[
"jellyfish>=0.8.0",
"numpy>=1.13.0",
"pandas>=1,<2",
"pandas>=1,<3",
"scipy>=1",
"scikit-learn>=0.19.0",
"joblib"
Expand Down

0 comments on commit 5cbe5c4

Please sign in to comment.