Skip to content

Commit

Permalink
Merge pull request #119 from ceph/fix-gha
Browse files Browse the repository at this point in the history
  • Loading branch information
zmc authored Jul 28, 2023
2 parents c880723 + 5ea54f2 commit a3066ed
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: CI
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
workflow_dispatch:

jobs:
Expand All @@ -15,12 +15,12 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]
python: [3.6, 3.9]
os: ["ubuntu-20.04"]
python: [3.6, 3.9, 3.11]
steps:
- uses: actions/checkout@v2
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python }}
- name: Install tox
Expand Down
3 changes: 0 additions & 3 deletions paddles/tests/controllers/test_nodes.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import pytest

from paddles.tests import TestApp
from paddles.models import Node, Job, start, commit

Expand Down Expand Up @@ -317,7 +315,6 @@ def test_update(self):

def test_delete(self):
node_name = 'a_node'
user = 'a_user'
self.app.post_json('/nodes/', dict(name=node_name))
response = self.app.get('/nodes/{name}/'.format(name=node_name))
assert response.json['name'] == node_name
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ alembic==0.8.2
Mako==1.0.2
mccabe==0.3.1
pecan==1.3.3
psycopg2-binary==2.8.6
pytz==2015.6
psycopg2-binary==2.9.5
pytz==2023.3
requests==2.20.0
simplegeneric==0.8.1
SQLAlchemy==1.3.0
tzlocal==1.2
WebTest==2.0.18
WebTest==3.0.0
gunicorn==20.0.4
python-statsd==2.0.0
mock==2.0.0
Expand Down

0 comments on commit a3066ed

Please sign in to comment.