Skip to content

build test 1 #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

build test 1 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8d02bc7
build test 1
antgonza Jul 22, 2024
71f9f43
build test 2
antgonza Jul 22, 2024
04e0c4a
build test 3
antgonza Jul 22, 2024
b0954f4
flake8
antgonza Jul 22, 2024
00f36ff
3.11
antgonza Jul 22, 2024
9bcadb6
rm 3.11
antgonza Jul 22, 2024
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
8 changes: 5 additions & 3 deletions .github/workflows/qiita-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

strategy:
matrix:
python-version: ["2.7", "3.9"]
python-version: ["3.9"]

services:
postgres:
Expand Down Expand Up @@ -79,14 +79,16 @@ jobs:
run: |
conda create --yes -n qiita_client python=${{ matrix.python-version }} pip nose flake8 coverage
conda activate qiita_client
pip --quiet install -U pip

pip --quiet install .

- name: Starting Main Services
shell: bash -l {0}
run: |

conda activate qiita
export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/server.crt
export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/ci_rootca.crt
export QIITA_CONFIG_FP=`pwd`/qiita-dev/qiita_core/support_files/config_test_local.cfg
sed "s#/home/runner/work/qiita/qiita#${PWD}/qiita-dev/#g" `pwd`/qiita-dev/qiita_core/support_files/config_test.cfg > ${QIITA_CONFIG_FP}

Expand Down Expand Up @@ -118,7 +120,7 @@ jobs:
COVER_PACKAGE: ${{ matrix.cover_package }}
run: |
conda activate qiita_client
export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/server.crt
export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/ci_rootca.crt
export QIITA_CONFIG_FP=`pwd`/qiita-dev/qiita_core/support_files/config_test_local.cfg

nosetests --with-doctest --with-coverage --cover-package=qiita_client
Expand Down
2 changes: 1 addition & 1 deletion qiita_client/qiita_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def __init__(self, output_name, artifact_type, files, archive=None):

def __eq__(self, other):
logger.debug('Entered ArtifactInfo.__eq__()')
if type(self) != type(other):
if type(self) is not type(other):
return False
if self.output_name != other.output_name or \
self.artifact_type != other.artifact_type or \
Expand Down
3 changes: 2 additions & 1 deletion qiita_client/tests/test_qiita_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ def test_complete_job(self):
# Create a new job
data = {
'user': 'demo@microbio.me',
'command': dumps(['QIIME', '1.9.1', 'Pick closed-reference OTUs']),
'command': dumps(['QIIMEq2', '1.9.1',
'Pick closed-reference OTUs']),
'status': 'running',
'parameters': dumps({"reference": 1,
"sortmerna_e_value": 1,
Expand Down
Loading