Skip to content

Commit

Permalink
Merge pull request #164 from PythonPredictions/159-short-term-pandas-…
Browse files Browse the repository at this point in the history
…20-support-avoid-pandas==20-installation

Short term pandas 2.0 support
  • Loading branch information
sandervh14 authored Apr 7, 2023
2 parents 1c44659 + 7c1a9ba commit 2dfc309
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/development_CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install -r requirements.txt
python -m pip install pylint pytest pytest-mock pytest-cov
python -m pip install -r requirements.dev.txt
- name: Test with pytest
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/master_CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install -r requirements.txt
python -m pip install pylint pytest pytest-mock pytest-cov
python -m pip install -r requirements.dev.txt
- name: Test with pytest
run: |
Expand Down
3 changes: 2 additions & 1 deletion requirements.dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ pycodestyle>=2.8.0
pydocstyle>=6.1.1
pylint>=2.13.7
pytest>=7.1.1
pytest-mock>=3.7.0
pytest-mock>=3.7.0
pytest-cov
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
numpy>=1.19.4
pandas>=1.1.5
pandas>=1.1.5,<2.0.0
scipy>=1.5.4
scikit-learn>=1.2.0
matplotlib>=3.4.3
Expand Down
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
setup(
name="pythonpredictions-cobra",
version=__version__,
description=("A Python package to build predictive linear and logistic regression "
"models focused on performance and interpretation."),
description=("A Python package to build predictive linear and logistic "
"regression models focused on performance and "
"interpretation."),
long_description=README,
long_description_content_type="text/x-rst",
packages=find_packages(include=["cobra", "cobra.*"]),
Expand All @@ -24,7 +25,7 @@
author_email="cobra@pythonpredictions.com",
install_requires=[
"numpy>=1.19.4",
"pandas>=1.1.5",
"pandas>=1.1.5,<2.0.0",
"scipy>=1.5.4",
"scikit-learn>=0.24.1",
"matplotlib>=3.4.3",
Expand Down

0 comments on commit 2dfc309

Please sign in to comment.