Skip to content

Commit

Permalink
Upgrade PyCDS to 3.3.0 and fix CI
Browse files Browse the repository at this point in the history
Work around for pipenv issue
pypa/pipenv#5042
  • Loading branch information
jameshiebert committed May 31, 2022
1 parent 1846a59 commit ea45851
Show file tree
Hide file tree
Showing 6 changed files with 106 additions and 178 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/python-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- name: Install pipenv
run: |
pip install -U pipenv
pip install -U pipenv==2022.3.28
- name: Install OS dependencies
run: |
Expand All @@ -33,6 +33,8 @@ jobs:

- name: Install dependencies if changed
if: steps.cache-pipenv.outputs.cache-hit != 'true'
env:
PIP_INDEX_URL: https://pypi.pacificclimate.org/simple
run: |
pipenv install --deploy --dev
pipenv run pip install .
Expand Down
16 changes: 14 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,35 @@ url = "https://pypi.python.org/simple"
verify_ssl = true
name = "pypi"

[[source]]
url = "https://pypi.pacificclimate.org/simple/"
verify_ssl = true

[[source]]
url = "https://pypi.pacificclimate.org/simple"
verify_ssl = true
name = "pypipacificclimate"

[packages]
lxml = "==4.6.3"
Pint = "==0.9"
psycopg2-binary = "==2.8"
pycds = "==2.2"

[packages.pycds]
version = "==3.3.0"
index = "pypipacificclimate"
python-dateutil = "==2.8"
pytz = "==2019.3"
PyYAML = "==5.4"
SQLAlchemy = "==1.4.*"
pysftp = "==0.2.8"

[packages.black]
version = "*"
index = "pypipacificclimate"

[dev-packages]
black = "==20.8b1"
black = {version = "*", index = "pypipacificclimate"}
pytest = "==6.1.2"
pytest-cov = "==2.10.1"
python-json-logger = "==0.1.9"
Expand Down
Loading

0 comments on commit ea45851

Please sign in to comment.