From 27a8ded28767979f5cd9c040f7d59812ae65f0ba Mon Sep 17 00:00:00 2001 From: vsoch Date: Tue, 7 Jun 2022 22:42:33 -0600 Subject: [PATCH 1/2] test tweaking github-py to >=2.0.0 for python 3.9 support Signed-off-by: vsoch --- .travis.yml | 1 + requirements/production.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d72356e..13f419a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ python: - '3.6' - '3.7' - '3.8' + - '3.9' install: - pip install flake8 bandit black diff --git a/requirements/production.txt b/requirements/production.txt index 1a46159..d7641da 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -1,4 +1,4 @@ -github3.py==1.2.0 +github3.py>=2.0.0 python-gitlab>=1.6.0 stashy>=0.3 python-dateutil>=2.7.3 diff --git a/setup.py b/setup.py index c8cec7b..c04fe29 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( name="llnl-scraper", - version="0.10.0", + version="0.10.1", description="Package for extracting software repository metadata", long_description=long_description, long_description_content_type="text/markdown", From eda31b2b00deeb0e52a814cabb3d7d41cf82fd32 Mon Sep 17 00:00:00 2001 From: vsoch Date: Thu, 9 Jun 2022 21:39:53 -0600 Subject: [PATCH 2/2] testing gh-actions workflow with python matrix Signed-off-by: vsoch --- .github/workflows/main.yml | 29 +++++++++++++++++++++++++++++ .travis.yml | 16 ---------------- Makefile | 1 + requirements/dev.txt | 1 + 4 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 .github/workflows/main.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..0587f0d --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,29 @@ +name: llnl-scraper + +on: + pull_request: [] + +jobs: + testing: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [ 'pypy3.6', "pypy3.7", "pypy3.8", "pypy3.9"] + name: Python ${{ matrix.python-version }} Tests + steps: + - uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + architecture: x64 + - name: Python Tests + run: | + conda create --quiet --name test pytest + export PATH="/usr/share/miniconda/bin:$PATH" + source activate test + pip install flake8 bandit black + pip install . + npm install -g markdownlint-cli@0.23.2 + make test + scraper -h diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 13f419a..0000000 --- a/.travis.yml +++ /dev/null @@ -1,16 +0,0 @@ -language: python - -python: - - '3.6' - - '3.7' - - '3.8' - - '3.9' - -install: - - pip install flake8 bandit black - - pip install . - - npm install -g markdownlint-cli@0.23.2 - -script: - - make test - - scraper -h diff --git a/Makefile b/Makefile index 823fd58..12df743 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ test: flake8 scraper/ black --check scraper/ markdownlint '**/*.md' + pyflakes scraper release: test python setup.py sdist bdist_wheel diff --git a/requirements/dev.txt b/requirements/dev.txt index b87f8ed..c571105 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -9,3 +9,4 @@ bandit black flake8 safety +pyflakes