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
14 changes: 3 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# mattered more once it stopped being self-contained: it now takes its
# log-binning from dcio, so a change over there can break it here.
#
# dcio is not on PyPI, so every job installs it from git before installing
# EKDIST. That step is the first thing to revisit when dcio is published.
# dcio resolves from PyPI, so `pip install -e .` brings it in like any other
# dependency. It used to need a git install first, which every job carried.

name: CI

Expand Down Expand Up @@ -51,17 +51,10 @@ jobs:
with:
python-version: ${{ matrix.python }}

# dcio must go in first: it is named in install_requires but cannot be
# resolved from PyPI, so `pip install -e .` would fail without it.
- name: Install dcio from git
shell: bash
run: |
python -m pip install --upgrade pip
pip install git+https://github.com/DCPROGS/dcio@master

- name: Install
shell: bash
run: |
python -m pip install --upgrade pip
pip install -e .
pip install pytest
pip list
Expand Down Expand Up @@ -100,7 +93,6 @@ jobs:
run: |
python -m venv /tmp/clean
/tmp/clean/bin/pip install --upgrade pip
/tmp/clean/bin/pip install git+https://github.com/DCPROGS/dcio@master
/tmp/clean/bin/pip install .
/tmp/clean/bin/pip list

Expand Down
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@
'numpy',
'scipy',
'matplotlib',
# The shared record layer. Not on PyPI yet, so a source install
# needs it first:
# pip install git+https://github.com/DCPROGS/dcio
'dcio',
'dcio>=0.1.0', # the shared record layer
#'PyQt5',
],
zip_safe=False)