From 0700903c2a3004d88bb6d7e62f947c73c412ef8d Mon Sep 17 00:00:00 2001 From: Emilio Reyes Date: Sun, 3 Oct 2021 14:08:39 -0700 Subject: [PATCH] Update and clean-up build Signed-off-by: Emilio Reyes --- .github/workflows/main.yml | 9 +++------ Dockerfile | 1 - README.md | 2 +- build.py | 7 ++++--- requirements.txt | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 802bfa2..b0447a2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,7 @@ on: - '**' pull_request: branches: - - master + - main jobs: build: runs-on: ubuntu-20.04 @@ -17,11 +17,8 @@ jobs: - name: Install pybuilder run: pip install pybuilder - - name: Install dependencies - run: pyb install_dependencies - - name: Execute build - run: pyb -X + run: pyb - name: Install Codecov requirements run: | @@ -33,4 +30,4 @@ jobs: uses: codecov/codecov-action@v1 with: token: ${{ secrets.CODECOV_TOKEN }} - file: coverage.xml + file: coverage.xml \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 1871a19..7b86304 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,5 +4,4 @@ ENV TERM xterm-256color WORKDIR /code COPY . /code/ RUN pip install pybuilder namegenerator -RUN pyb install_dependencies RUN pyb install \ No newline at end of file diff --git a/README.md b/README.md index 1365ef2..fac0ae4 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,7 @@ docker container run \ -e https_proxy \ -v $PWD:/code \ mpcurses:latest \ -/bin/sh +/bin/bash ``` Execute the build: diff --git a/build.py b/build.py index 825628a..d799f90 100644 --- a/build.py +++ b/build.py @@ -19,7 +19,6 @@ use_plugin('python.core') use_plugin('python.unittest') -use_plugin('python.install_dependencies') use_plugin('python.flake8') use_plugin('python.coverage') use_plugin('python.distutils') @@ -38,8 +37,7 @@ 'publish', 'radon', 'bandit', - 'anybadge', - 'package'] + 'anybadge'] license = 'Apache License, Version 2.0' description = summary @@ -69,6 +67,9 @@ def set_properties(project): 'License :: OSI Approved :: Apache Software License', 'Operating System :: POSIX :: Linux', 'Programming Language :: Python', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Topic :: Software Development :: Libraries', 'Topic :: Software Development :: Libraries :: Python Modules', diff --git a/requirements.txt b/requirements.txt index 0faf396..e468799 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -mpmq +mpmq \ No newline at end of file