Skip to content

Commit 320c415

Browse files
authored
Merge pull request #978 from bashtage/modernize
MAINT: Modernize setup
2 parents 9cd961c + 7cca42f commit 320c415

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+262
-2821
lines changed

MANIFEST.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ include LICENSE.md
33
include requirements.txt
44
include requirements-dev.txt
55
include pandas_datareader/*.py
6-
76
include pandas_datareader/tests/*.py
87
include pandas_datareader/tests/data/*
9-
include versioneer.py
108
include pandas_datareader/_version.py

azure-pipelines.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,16 @@ trigger:
1313

1414
variables:
1515
PYTHONHASHSEED: 12345678
16-
SETUPTOOLS_USE_DISTUTILS: "stdlib"
1716
coverage: true
18-
RANDOMGEN_CYTHON_COVERAGE: true
1917

2018
jobs:
2119

2220
- template: ci/azure/azure_template_posix.yml
2321
parameters:
2422
name: Linux
25-
vmImage: ubuntu-20.04
23+
vmImage: ubuntu-latest
2624

2725
- template: ci/azure/azure_template_windows.yml
2826
parameters:
2927
name: Windows
30-
vmImage: windows-2019
28+
vmImage: windows-latest

ci/azure/azure_template_posix.yml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,19 @@ jobs:
1616
vmImage: ${{ parameters.vmImage }}
1717
strategy:
1818
matrix:
19-
${{ if eq(parameters.name, 'Linux') }}:
20-
python36_legacy:
21-
python.version: '3.6'
22-
PANDAS: 1.0.5
23-
python37_legacy:
24-
python.version: '3.7'
25-
PANDAS: 1.1.5
26-
python38_recent:
27-
python.version: '3.8'
28-
PANDAS: 1.2.5
29-
python39_latest:
30-
python.version: '3.9'
31-
32-
# maxParallel: 10
19+
python38_legacy:
20+
python.version: '3.8'
21+
PANDAS: 1.5.3
22+
python39_legacy:
23+
python.version: '3.9'
24+
PANDAS: 1.5.3
25+
python310_recent:
26+
python.version: '3.9'
27+
PANDAS: 2.0.3
28+
python311_latest:
29+
python.version: '3.11'
30+
python312_latest:
31+
python.version: '3.12'
3332

3433
steps:
3534
- task: UsePythonVersion@0
@@ -41,14 +40,13 @@ jobs:
4140
python -m pip install pip setuptools -U
4241
python -m pip install -r requirements.txt
4342
python -m pip install -r requirements-dev.txt
44-
4543
if [[ -n ${PANDAS} ]]; then
4644
python -m pip install pandas==${PANDAS}
4745
fi;
4846
displayName: 'Install dependencies'
4947
5048
- script: |
51-
python -m pip install -e . -v --no-build-isolation
49+
python -m pip install -e . -vv
5250
displayName: 'Install'
5351
5452
- script: python -m pip list

ci/azure/azure_template_windows.yml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,19 @@ jobs:
1616
vmImage: ${{ parameters.vmImage }}
1717
strategy:
1818
matrix:
19-
${{ if eq(parameters.name, 'Linux') }}:
20-
python37_legacy:
21-
python.version: '3.7'
22-
PANDAS: 1.0.5
23-
python38_legacy:
24-
python.version: '3.8'
25-
PANDAS: 1.1.5
26-
python38_recent:
27-
python.version: '3.8'
28-
PANDAS: 1.2.5
29-
python39_latest:
30-
python.version: '3.9'
31-
32-
# maxParallel: 10
19+
python38_legacy:
20+
python.version: '3.8'
21+
PANDAS: 1.5.3
22+
python39_legecy:
23+
python.version: '3.9'
24+
PANDAS: 1.5.3
25+
python310_recent:
26+
python.version: '3.10'
27+
PANDAS: 2.0.3
28+
python311_latest:
29+
python.version: '3.11'
30+
python312_latest:
31+
python.version: '3.12'
3332

3433
steps:
3534
- task: UsePythonVersion@0
@@ -42,13 +41,16 @@ jobs:
4241
python -m pip install -r requirements.txt
4342
python -m pip install -r requirements-dev.txt
4443
45-
if [[ -n ${PANDAS} ]]; then
46-
python -m pip install pandas==${PANDAS}
47-
fi;
4844
displayName: 'Install dependencies'
4945
46+
- powershell: |
47+
if ($null -ne $env:PANDAS) {
48+
python -m pip install pandas==${PANDAS}
49+
}
50+
displayName: 'Update pandas (if needed)'
51+
5052
- script: |
51-
python -m pip install -e . -v --no-build-isolation
53+
python -m pip install -e . -vv
5254
displayName: 'Install'
5355
5456
- script: python -m pip list

ci/pypi-install.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

pandas_datareader/__init__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
import sys
33

4-
from ._version import get_versions
4+
from ._version import __version__
55
from .data import (
66
DataReader,
77
Options,
@@ -33,9 +33,6 @@
3333

3434
PKG = os.path.dirname(__file__)
3535

36-
__version__ = get_versions()["version"]
37-
del get_versions
38-
3936
__all__ = [
4037
"__version__",
4138
"get_components_yahoo",

pandas_datareader/_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ def _sanitize_dates(start, end):
4646
try:
4747
start = to_datetime(start)
4848
end = to_datetime(end)
49-
except (TypeError, ValueError):
50-
raise ValueError("Invalid date format.")
49+
except (TypeError, ValueError) as exc:
50+
raise ValueError("Invalid date format.") from exc
5151
if start > end:
5252
raise ValueError("start must be an earlier date than end")
5353
return start, end

0 commit comments

Comments
 (0)