Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ include LICENSE.md
include requirements.txt
include requirements-dev.txt
include pandas_datareader/*.py

include pandas_datareader/tests/*.py
include pandas_datareader/tests/data/*
include versioneer.py
include pandas_datareader/_version.py
6 changes: 2 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,16 @@ trigger:

variables:
PYTHONHASHSEED: 12345678
SETUPTOOLS_USE_DISTUTILS: "stdlib"
coverage: true
RANDOMGEN_CYTHON_COVERAGE: true

jobs:

- template: ci/azure/azure_template_posix.yml
parameters:
name: Linux
vmImage: ubuntu-20.04
vmImage: ubuntu-latest

- template: ci/azure/azure_template_windows.yml
parameters:
name: Windows
vmImage: windows-2019
vmImage: windows-latest
30 changes: 14 additions & 16 deletions ci/azure/azure_template_posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,19 @@ jobs:
vmImage: ${{ parameters.vmImage }}
strategy:
matrix:
${{ if eq(parameters.name, 'Linux') }}:
python36_legacy:
python.version: '3.6'
PANDAS: 1.0.5
python37_legacy:
python.version: '3.7'
PANDAS: 1.1.5
python38_recent:
python.version: '3.8'
PANDAS: 1.2.5
python39_latest:
python.version: '3.9'

# maxParallel: 10
python38_legacy:
python.version: '3.8'
PANDAS: 1.5.3
python39_legacy:
python.version: '3.9'
PANDAS: 1.5.3
python310_recent:
python.version: '3.9'
PANDAS: 2.0.3
python311_latest:
python.version: '3.11'
python312_latest:
python.version: '3.12'

steps:
- task: UsePythonVersion@0
Expand All @@ -41,14 +40,13 @@ jobs:
python -m pip install pip setuptools -U
python -m pip install -r requirements.txt
python -m pip install -r requirements-dev.txt

if [[ -n ${PANDAS} ]]; then
python -m pip install pandas==${PANDAS}
fi;
displayName: 'Install dependencies'

- script: |
python -m pip install -e . -v --no-build-isolation
python -m pip install -e . -vv
displayName: 'Install'

- script: python -m pip list
Expand Down
38 changes: 20 additions & 18 deletions ci/azure/azure_template_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,19 @@ jobs:
vmImage: ${{ parameters.vmImage }}
strategy:
matrix:
${{ if eq(parameters.name, 'Linux') }}:
python37_legacy:
python.version: '3.7'
PANDAS: 1.0.5
python38_legacy:
python.version: '3.8'
PANDAS: 1.1.5
python38_recent:
python.version: '3.8'
PANDAS: 1.2.5
python39_latest:
python.version: '3.9'

# maxParallel: 10
python38_legacy:
python.version: '3.8'
PANDAS: 1.5.3
python39_legecy:
python.version: '3.9'
PANDAS: 1.5.3
python310_recent:
python.version: '3.10'
PANDAS: 2.0.3
python311_latest:
python.version: '3.11'
python312_latest:
python.version: '3.12'

steps:
- task: UsePythonVersion@0
Expand All @@ -42,13 +41,16 @@ jobs:
python -m pip install -r requirements.txt
python -m pip install -r requirements-dev.txt

if [[ -n ${PANDAS} ]]; then
python -m pip install pandas==${PANDAS}
fi;
displayName: 'Install dependencies'

- powershell: |
if ($null -ne $env:PANDAS) {
python -m pip install pandas==${PANDAS}
}
displayName: 'Update pandas (if needed)'

- script: |
python -m pip install -e . -v --no-build-isolation
python -m pip install -e . -vv
displayName: 'Install'

- script: python -m pip list
Expand Down
17 changes: 0 additions & 17 deletions ci/pypi-install.sh

This file was deleted.

5 changes: 1 addition & 4 deletions pandas_datareader/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os
import sys

from ._version import get_versions
from ._version import __version__
from .data import (
DataReader,
Options,
Expand Down Expand Up @@ -33,9 +33,6 @@

PKG = os.path.dirname(__file__)

__version__ = get_versions()["version"]
del get_versions

__all__ = [
"__version__",
"get_components_yahoo",
Expand Down
4 changes: 2 additions & 2 deletions pandas_datareader/_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ def _sanitize_dates(start, end):
try:
start = to_datetime(start)
end = to_datetime(end)
except (TypeError, ValueError):
raise ValueError("Invalid date format.")
except (TypeError, ValueError) as exc:
raise ValueError("Invalid date format.") from exc
if start > end:
raise ValueError("start must be an earlier date than end")
return start, end
Expand Down
Loading