Skip to content

Commit a013587

Browse files
MAINT: fix version conflict (#48)
* address seaborn 0.13 error * various GHA updates * require pandas >= 1.3 * address #38
1 parent 9f31abe commit a013587

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

.github/workflows/build_wheels.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ name: PyPI
33
on:
44
workflow_dispatch:
55
inputs:
6-
publish_to_pypi:
7-
description: 'Publish to PyPI?'
6+
target:
7+
type: choice
8+
description: 'Package Index'
89
required: true
9-
type: string
10-
default: 'false'
10+
default: 'PYPI'
11+
options: [ 'TESTPYPI', 'PYPI' ]
1112

1213
jobs:
1314
dist:
@@ -23,8 +24,7 @@ jobs:
2324
uses: actions/checkout@v4
2425
with:
2526
fetch-depth: 0
26-
ref: '0.9.7'
27-
27+
ref: 0.9.7
2828

2929
- name: Set up Python ${{ matrix.python-version }}
3030
uses: actions/setup-python@v5
@@ -52,16 +52,16 @@ jobs:
5252
path: dist
5353

5454
- name: publish to testpypi
55+
if: ${{ github.event.inputs.target == 'TESTPYPI' }}
5556
uses: pypa/gh-action-pypi-publish@release/v1
56-
if: ${{ inputs.publish_to_pypi == 'false' }}
5757
with:
5858
user: __token__
5959
password: ${{ secrets.TESTPYPI_TOKEN }}
6060
repository_url: https://test.pypi.org/legacy/
6161

6262
- name: publish to pypi
63+
if: ${{ github.event.inputs.target == 'PYPI' }}
6364
uses: pypa/gh-action-pypi-publish@release/v1
64-
if: ${{ inputs.publish_to_pypi == 'true' }}
6565
with:
6666
user: __token__
6767
password: ${{ secrets.PYPI_TOKEN }}

.github/workflows/unit_tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111

1212
jobs:
1313
build:
14+
name: Unit Tests for ${{ matrix.python-version }} on ${{ matrix.os }}
1415
runs-on: ${{ matrix.os }}
1516
strategy:
1617
fail-fast: false

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ repos:
88
- id: trailing-whitespace
99
- id: check-added-large-files
1010

11-
- repo: https://gitlab.com/pycqa/flake8
12-
rev: 3.9.1
11+
- repo: https://github.com/PyCQA/flake8
12+
rev: 7.0.0
1313
hooks:
1414
- id: flake8
1515

pyproject.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ extend-exclude = '''
134134
[tool.tox]
135135
legacy_tox_ini = """
136136
[tox]
137-
envlist = py39-pandas{11,12},py{39,310}-pandas{13,14,15}, py{39,310, 311,312}-pandas{20,21,22}
137+
envlist = py{39,310}-pandas{13,14,15}, py{39,310, 311,312}-pandas{20,21,22}
138138
isolated_build = True
139139
skip_missing_interpreters = True
140140
minversion = 3.23.0
@@ -154,8 +154,6 @@ setenv =
154154
changedir = tmp
155155
extras = test
156156
deps =
157-
pandas11: pandas>=1.1.0,<1.2
158-
pandas12: pandas>=1.2.0,<1.3
159157
pandas13: pandas>=1.3.0,<1.4
160158
pandas14: pandas>=1.4.0,<1.5
161159
pandas15: pandas>=1.5.0,<1.6

src/pyfolio/plotting.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ def cone(in_sample_returns (pd.Series),
811811
ax.yaxis.set_major_formatter(FuncFormatter(y_axis_formatter))
812812

813813
if factor_returns is not None:
814-
cum_factor_returns = ep.cum_returns(factor_returns[cum_rets.index], 1.0)
814+
cum_factor_returns = ep.cum_returns(factor_returns.loc[cum_rets.index], 1.0)
815815
cum_factor_returns.plot(
816816
lw=2,
817817
color="gray",

0 commit comments

Comments
 (0)