From 289a69bf412c9850d2a8e02d7d82417848d70d02 Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Tue, 12 Apr 2022 16:58:45 -0400 Subject: [PATCH 1/4] Stop using unecrypted git prot for edit deps --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 680360b0..1f139fba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ # we require a pinned dev branch to get some edge features that # are often untested in tractor's CI and/or being tested by us # first before committing as core features in tractor's base. --e git+git://github.com/goodboy/tractor.git@master#egg=tractor +-e git+ssh://git@github.com/goodboy/tractor.git@master#egg=tractor # `pyqtgraph` peeps keep breaking, fixing, improving so might as well # pin this to a dev branch that we have more control over especially # as more graphics stuff gets hashed out. --e git+git://github.com/pikers/pyqtgraph.git@piker_pin#egg=pyqtgraph +-e git+ssh://git@github.com/pikers/pyqtgraph.git@piker_pin#egg=pyqtgraph From 3762466a586cd6ef9edba9de1047ae5d7d7a4707 Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Tue, 12 Apr 2022 17:12:07 -0400 Subject: [PATCH 2/4] Try running CI on 3.10 and drop eager install --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6ed44db..b9321273 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,13 +25,13 @@ jobs: - name: Setup python uses: actions/setup-python@v2 with: - python-version: '3.9' + python-version: '3.10' - name: Install dependencies - run: pip install -e . --upgrade-strategy eager -r requirements.txt + run: pip install -e . -r requirements.txt - name: Run piker cli - run: piker + run: piker testing: name: 'test suite' @@ -44,7 +44,7 @@ jobs: - name: Setup python uses: actions/setup-python@v2 with: - python-version: '3.9' + python-version: '3.10' - name: Install dependencies run: pip install -U . -r requirements-test.txt -r requirements.txt --upgrade-strategy eager From 6324624811d42de9256de78b6ccb2d3554cdf734 Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Tue, 12 Apr 2022 17:21:39 -0400 Subject: [PATCH 3/4] Try https? --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1f139fba..e64267b9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ # we require a pinned dev branch to get some edge features that # are often untested in tractor's CI and/or being tested by us # first before committing as core features in tractor's base. --e git+ssh://git@github.com/goodboy/tractor.git@master#egg=tractor +-e git+https://github.com/goodboy/tractor.git@master#egg=tractor # `pyqtgraph` peeps keep breaking, fixing, improving so might as well # pin this to a dev branch that we have more control over especially # as more graphics stuff gets hashed out. --e git+ssh://git@github.com/pikers/pyqtgraph.git@piker_pin#egg=pyqtgraph +-e git+https://github.com/pikers/pyqtgraph.git@piker_pin#egg=pyqtgraph From a45156cbb70cd46811d23deb770f990257ab72b6 Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Tue, 12 Apr 2022 21:30:20 -0400 Subject: [PATCH 4/4] Use checkout and setup-python v3 actions and drop dev install --- .github/workflows/ci.yml | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9321273..bec62534 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,6 @@ name: CI + on: # Triggers the workflow on push or pull request events but only for the master branch push: @@ -10,39 +11,19 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: + jobs: - basic_install: - name: 'pip install' - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v2 - with: - ref: master - - - name: Setup python - uses: actions/setup-python@v2 - with: - python-version: '3.10' - - - name: Install dependencies - run: pip install -e . -r requirements.txt - - - name: Run piker cli - run: piker - testing: - name: 'test suite' + name: 'install + test-suite' runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: '3.10'