Skip to content
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.

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

Tidy up github CI scripts #1041

Merged
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
21 changes: 10 additions & 11 deletions .github/workflows/pythonpackage-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: Test on python ${{ matrix.python-version }} and ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
max-parallel: 3
max-parallel: 4
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
os: [ubuntu-latest]
Expand All @@ -27,17 +27,16 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools
pip install urllib3 certifi pytz pyflakes faker nose
pip install certifi configparser urllib3 mock nose
- name: Run check
run: |
export PATH=${HOME}/.local/bin:${PATH}
make check
- name: Test with nosetests
- name: Run unit tests
run: |
pyflakes minio/*.py || true
python setup.py install
python setup.py nosetests
- name: Test with functional tests
- name: Run functional tests
env:
MINT_MODE: full
SERVER_ENDPOINT: localhost:9000
Expand All @@ -48,9 +47,9 @@ jobs:
MINIO_SECRET_KEY: minio123
SSL_CERT_FILE: /tmp/minio-config/certs/public.crt
run: |
wget --quiet -O /tmp/minio https://dl.min.io/server/minio/release/linux-amd64/minio
chmod +x /tmp/minio
mkdir -p /tmp/minio-config/certs/
cp tests/certs/* /tmp/minio-config/certs/
/tmp/minio -C /tmp/minio-config server /tmp/fs{1...4} &
python tests/functional/tests.py
wget --quiet -O /tmp/minio https://dl.min.io/server/minio/release/linux-amd64/minio
chmod +x /tmp/minio
mkdir -p /tmp/minio-config/certs/
cp tests/certs/* /tmp/minio-config/certs/
/tmp/minio -C /tmp/minio-config server /tmp/fs{1...4} &
python tests/functional/tests.py
22 changes: 10 additions & 12 deletions .github/workflows/pythonpackage-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: Test on python ${{ matrix.python-version }} and ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
max-parallel: 3
max-parallel: 4
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
os: [windows-latest]
Expand All @@ -27,14 +27,12 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools
pip install urllib3 certifi pytz pyflakes faker nose
- name: Test with nosetests
pip install certifi configparser urllib3 mock nose
- name: Run unit tests
run: |
$ErrorActionPreference = 'continue'
pyflakes minio/*.py
python setup.py install
python setup.py nosetests
- name: Test with functional tests
- name: Run functional tests
env:
MINT_MODE: full
SERVER_ENDPOINT: localhost:9000
Expand All @@ -44,9 +42,9 @@ jobs:
MINIO_ACCESS_KEY: minio
MINIO_SECRET_KEY: minio123
run: |
New-Item -ItemType Directory -Path "$env:temp/minio-config/certs/"
Copy-Item -Path tests\certs\* -Destination "$env:temp/minio-config/certs/"
Invoke-WebRequest -Uri https://dl.minio.io/server/minio/release/windows-amd64/minio.exe -OutFile $HOME/minio.exe
Start-Process -NoNewWindow -FilePath "$HOME/minio.exe" -ArgumentList "-C", "$env:temp/minio-config", "server", "$env:temp/fs{1...4}"
$env:SSL_CERT_FILE = "$env:temp/minio-config/certs/public.crt"
python tests/functional/tests.py
New-Item -ItemType Directory -Path "$env:temp/minio-config/certs/"
Copy-Item -Path tests\certs\* -Destination "$env:temp/minio-config/certs/"
Invoke-WebRequest -Uri https://dl.minio.io/server/minio/release/windows-amd64/minio.exe -OutFile $HOME/minio.exe
Start-Process -NoNewWindow -FilePath "$HOME/minio.exe" -ArgumentList "-C", "$env:temp/minio-config", "server", "$env:temp/fs{1...4}"
$env:SSL_CERT_FILE = "$env:temp/minio-config/certs/public.crt"
python tests/functional/tests.py
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# MinIO Python Library for Amazon S3 Compatible Cloud Storage, (C) 2015 MinIO, Inc.
# MinIO Python Library for Amazon S3 Compatible Cloud Storage,
# (C) 2015 MinIO, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -44,8 +45,8 @@
long_description_content_type="text/markdown",
package_dir={"minio": "minio"},
packages=["minio", "minio.credentials"],
install_requires=["urllib3", "certifi", "configparser"],
tests_require=["nose", "mock", "Faker"],
install_requires=["certifi", "configparser", "urllib3"],
tests_require=["mock", "nose"],
license="Apache License 2.0",
classifiers=[
"Development Status :: 5 - Production/Stable",
Expand Down