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
12 changes: 9 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,19 @@ jobs:
formatting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Setup black linter
run: conda create --quiet --name black black
run: conda create --quiet --name black black pyflakes

- name: Lint python code
- name: Lint python code with black
run: |
export PATH="/usr/share/miniconda/bin:$PATH"
source activate black
black --check spython

- name: Check unused imports with pyflakes
run: |
export PATH="/usr/share/miniconda/bin:$PATH"
source activate black
pyflakes spython/oci spython/image spython/instance spython/main
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ The client here will eventually be released as "spython" (and eventually to
singularity on pypi), and the versions here will coincide with these releases.

## [master](https://github.com/singularityhub/singularity-cli/tree/master)
- Small bugfix for docker writer and adding pyflakes for unused imports (0.0.84)
- Adding support for multistage build parsing (0.0.83)
- Singularity Python does not yet support multistage builds (0.0.82)
- stream command should print to stdout given CalledProcessError (0.0.81)
Expand Down
1 change: 0 additions & 1 deletion spython/image/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import hashlib
import os
import re
from spython.logger import bot
from spython.utils import split_uri

Expand Down
2 changes: 1 addition & 1 deletion spython/instance/cmd/logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def _logs(self, print_logs=False, ext="out"):
"""A shared function to print log files. The only differing element is
the extension (err or out)
"""
from spython.utils import check_install, run_command
from spython.utils import check_install

check_install()

Expand Down
5 changes: 0 additions & 5 deletions spython/main/base/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@
from .logger import println, init_level
from .generate import RobotNamer

import json
import sys
import os
import re


class Client:
def __str__(self):
Expand Down
1 change: 0 additions & 1 deletion spython/main/parse/parsers/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

from spython.logger import bot
from .base import ParserBase
from ..recipe import Recipe


class DockerParser(ParserBase):
Expand Down
2 changes: 1 addition & 1 deletion spython/main/parse/writers/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def validate_stage(self, parser):
uri_regexes = [_reduced_uri, _default_uri, _docker_uri]

for r in uri_regexes:
match = r.match(parse.fromHeader)
match = r.match(parser.fromHeader)
if match:
break

Expand Down
1 change: 0 additions & 1 deletion spython/oci/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

from spython.image import ImageBase
from spython.logger import bot
import os


class OciImage(ImageBase):
Expand Down
2 changes: 1 addition & 1 deletion spython/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# with this file, You can obtain one at http://mozilla.org/MPL/2.0/.


__version__ = "0.0.83"
__version__ = "0.0.84"
AUTHOR = "Vanessa Sochat"
AUTHOR_EMAIL = "vsochat@stanford.edu"
NAME = "spython"
Expand Down