Skip to content

Commit

Permalink
Merge pull request #241 from rs-station/renovate/pandas-2.x
Browse files Browse the repository at this point in the history
Update dependency pandas to >=2.0.0, <=2.2.2
  • Loading branch information
JBGreisman committed Apr 15, 2024
2 parents b9918b1 + dc2e7bc commit 889667c
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11']

# Skip CI if 'skip ci' is contained in latest commit message
if: "!contains(github.event.head_commit.message, 'skip ci')"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Expand Up @@ -16,10 +16,10 @@ jobs:
steps:

- uses: actions/checkout@v4
- name: Set up Python 3.9
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: 3.11

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install Python
uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.11'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/testdocumentation.yml
Expand Up @@ -16,10 +16,10 @@ jobs:
steps:

- uses: actions/checkout@v4
- name: Set up Python 3.9
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: 3.11

- name: Install dependencies
run: |
Expand Down
14 changes: 13 additions & 1 deletion reciprocalspaceship/dtypes/internals.py
Expand Up @@ -217,7 +217,7 @@ def fillna(
new_values = self[:]
return new_values

def _pad_or_backfill(self, *, method, limit=None, copy=True):
def _pad_or_backfill(self, *, method, limit=None, limit_area=None, copy=True):
mask = self._mask

if mask.any():
Expand All @@ -229,6 +229,18 @@ def _pad_or_backfill(self, *, method, limit=None, copy=True):
npvalues = npvalues.copy()
new_mask = new_mask.copy()
func(npvalues, limit=limit, mask=new_mask)

if limit_area is not None and not mask.all():
mask = mask.T
neg_mask = ~mask
first = neg_mask.argmax()
last = len(neg_mask) - neg_mask[::-1].argmax() - 1
if limit_area == "inside":
new_mask[:first] |= mask[:first]
new_mask[last + 1 :] |= mask[last + 1 :]
elif limit_area == "outside":
new_mask[first + 1 : last] |= mask[first + 1 : last]

if copy:
return self._simple_new(npvalues.T, new_mask.T)
else:
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -72,10 +72,10 @@ def getVersionNumber():
author_email="kmdalton@g.harvard.edu, greisman@g.harvard.edu",
url="https://rs-station.github.io/reciprocalspaceship/",
project_urls=PROJECT_URLS,
python_requires=">3.7",
python_requires=">=3.9",
install_requires=[
"gemmi>=0.5.5, <=0.6.5",
"pandas>=2.0.0, <=2.1.4",
"pandas>=2.2.2, <=2.2.2",
"numpy",
"scipy",
"ipython",
Expand Down

0 comments on commit 889667c

Please sign in to comment.