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.

Sign up for GitHub

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

Jump to bottom

Add support for pandas==2 #192

Merged
merged 6 commits into from
Jul 19, 2023
Merged

Add support for pandas==2 #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c4c8bf1
Add support for pandas 2
J535D165 May 23, 2023
e36f62e
Fix flake8 config
J535D165 Jul 18, 2023
d1d9200
Update workflow
J535D165 Jul 18, 2023
fbc75d1
Fix matrix
J535D165 Jul 18, 2023
d7fa288
Fix EOL error
J535D165 Jul 19, 2023
323e8c5
New fix
J535D165 Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/ci-workflow.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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