Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

⚠️ CONFLICT! Lineage pull request for: skeleton #26

Draft
wants to merge 55 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
57b4abe
Update actions/setup-go from v2 to v3
mcdonnnj May 27, 2022
8f68498
Update the version of Go used from 1.16 to 1.18
mcdonnnj May 27, 2022
fc55e84
Update the version of Go used from 1.18 to 1.19
mcdonnnj Nov 8, 2022
ec83308
Merge pull request #113 from cisagov/improvement/update_go_configuration
mcdonnnj Nov 8, 2022
2775dfa
Bump hashicorp/setup-terraform from 1 to 2
dependabot[bot] Nov 8, 2022
4925eb1
Merge pull request #111 from cisagov/dependabot/github_actions/hashic…
mcdonnnj Nov 8, 2022
1f7c62e
Bump actions/setup-python from 3 to 4
dependabot[bot] Nov 8, 2022
f74b4a3
Merge pull request #115 from cisagov/dependabot/github_actions/action…
mcdonnnj Nov 8, 2022
6a9c630
Add an ownership comment to the Dependabot configuration
mcdonnnj May 27, 2022
dfd54e9
Add additional Dependabot ignore directives
mcdonnnj May 27, 2022
a8bcddd
Merge pull request #112 from cisagov/improvement/update_dependabot_ig…
mcdonnnj Nov 8, 2022
71a88a5
Remove usage of set-output from our GitHub Actions workflow
mcdonnnj Oct 11, 2022
0867685
Merge pull request #119 from cisagov/bug/update_github_actions_workflow
mcdonnnj Nov 8, 2022
21a68f4
Enable the allow-non-breakable-inline-mappings rule for yamllint
mcdonnnj Sep 7, 2022
3547c4f
Increase the maximum line length in the yamllint configuration
mcdonnnj Sep 7, 2022
cfa9ba5
Merge pull request #117 from cisagov/improvement/update_yamllint_line…
mcdonnnj Nov 8, 2022
b1ea3d4
Fix the repo of the flake8 pre-commit hook
mcdonnnj Oct 14, 2022
2a98c6a
Merge pull request #120 from cisagov/bug/verify_pre-commit_hook_repos
mcdonnnj Nov 8, 2022
fb8d13f
Update pre-commit hooks
mcdonnnj May 27, 2022
bb9c2a0
Merge pull request #114 from cisagov/maintenance/update_pre-commit_hooks
mcdonnnj Nov 8, 2022
e5fbd70
Add a label configuration file
mcdonnnj Oct 5, 2022
b9792a8
Add a workflow to synchronize repository labels
mcdonnnj Oct 5, 2022
161c4ae
Remove duplicate label
jsf9k Oct 21, 2022
5993231
Add a label for issues or PRs that involve test code
jsf9k Oct 21, 2022
c4fbf20
Merge pull request #118 from cisagov/improvement/add_label_sync_workflow
mcdonnnj Nov 8, 2022
6cc53dc
Fix GitHub label color values
mcdonnnj Nov 9, 2022
8f12635
Correct spacing in yamllint rules
mcdonnnj Nov 9, 2022
e803e1a
Merge pull request #122 from cisagov/bug/fix_bad_configurations
mcdonnnj Nov 9, 2022
d9a1c30
Pin Python 3.6 testing to Ubuntu 20.04
mcdonnnj Nov 26, 2022
a118836
Merge pull request #114 from cisagov/bug/pin_ubuntu_image_for_py3.6
mcdonnnj Jan 7, 2023
19f3f8f
Merge github.com:cisagov/skeleton-generic into lineage/skeleton
mcdonnnj Jan 7, 2023
b389d8a
Add a `python` label
mcdonnnj Jan 7, 2023
461e873
Merge pull request #110 from cisagov/lineage/skeleton
mcdonnnj Jan 7, 2023
62c8394
Update the version of the second bandit hook
mcdonnnj Nov 9, 2022
99ee709
Correct poor English in comments for the bandit pre-commit hooks
mcdonnnj Nov 9, 2022
36b39b8
Merge pull request #111 from cisagov/bug/update_bandit_in_pre-commit_…
mcdonnnj Jan 7, 2023
f3f9d92
Add a CodeQL status badge to the README
mcdonnnj Nov 26, 2022
fa30ebb
Remove LGTM badges from the README
mcdonnnj Jan 5, 2023
ec639ea
Merge pull request #115 from cisagov/improvement/update_codeql_workflow
mcdonnnj Jan 7, 2023
abb9311
Add additional PyPI trove classifiers
mcdonnnj Oct 29, 2022
94f78f9
Merge pull request #108 from cisagov/improvement/update_trove_classif…
mcdonnnj Jan 7, 2023
56c90d6
Fix overly match-happy sed commands
jsf9k Sep 13, 2022
5314334
Merge pull request #104 from cisagov/bugfix/tighten-regex-in-version-…
mcdonnnj Jan 7, 2023
034cef8
Add a GitHub Actions job to test wheels
mcdonnnj Jan 5, 2023
63f4a73
Prefer block-style to flow-style in GitHub Actions job needs
mcdonnnj Jan 5, 2023
cbc0157
Merge pull request #116 from cisagov/improvement/test_wheels_built_in…
mcdonnnj Jan 7, 2023
6a5c156
Add support for Python 3.11
mcdonnnj Oct 29, 2022
abd6218
Bump version from 0.1.0 to 0.2.0
mcdonnnj Jan 7, 2023
65604c7
Merge pull request #109 from cisagov/improvement/add_support_for_pyth…
mcdonnnj Jan 7, 2023
c7c0ee9
Bump actions/upload-artifact from 2 to 3
dependabot[bot] Jan 7, 2023
d28cf0d
Merge https://github.com/cisagov/skeleton-python-library into lineage…
Jan 7, 2023
f514a6c
Merge pull request #102 from cisagov/dependabot/github_actions/action…
mcdonnnj Jan 8, 2023
4709716
Add ignore directives to the dependabot configuration
mcdonnnj Jan 7, 2023
eb2605b
Merge pull request #117 from cisagov/improvement/add_github_actions_a…
mcdonnnj Jan 8, 2023
7ae63dd
Merge https://github.com/cisagov/skeleton-python-library into lineage…
Jan 8, 2023
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
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,16 @@ updates:
schedule:
interval: "weekly"
ignore:
# Managed by cisagov/skeleton-generic
- dependency-name: actions/cache
- dependency-name: actions/checkout
- dependency-name: actions/setup-go
- dependency-name: actions/setup-python
- dependency-name: hashicorp/setup-terraform
- dependency-name: mxschmitt/action-tmate
# # Managed by cisagov/skeleton-python-library
# - dependency-name: actions/download-artifact
# - dependency-name: actions/upload-artifact

- package-ecosystem: "pip"
directory: "/"
Expand Down
70 changes: 70 additions & 0 deletions .github/labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
---
# Rather than breaking up descriptions into multiline strings we disable that
# specific rule in yamllint for this file.
# yamllint disable rule:line-length
- color: "eb6420"
description: This issue or pull request is awaiting the outcome of another issue or pull request
name: blocked
- color: "000000"
description: This issue or pull request involves changes to existing functionality
name: breaking change
- color: "d73a4a"
description: This issue or pull request addresses broken functionality
name: bug
- color: "07648d"
description: This issue will be advertised on code.gov's Open Tasks page (https://code.gov/open-tasks)
name: code.gov
- color: "0366d6"
description: Pull requests that update a dependency file
name: dependencies
- color: "5319e7"
description: This issue or pull request improves or adds to documentation
name: documentation
- color: "cfd3d7"
description: This issue or pull request already exists or is covered in another issue or pull request
name: duplicate
- color: "b005bc"
description: A high-level objective issue encompassing multiple issues instead of a specific unit of work
name: epic
- color: "000000"
description: Pull requests that update GitHub Actions code
name: github-actions
- color: "0e8a16"
description: This issue or pull request is well-defined and good for newcomers
name: good first issue
- color: "ff7518"
description: Pull request that should count toward Hacktoberfest participation
name: hacktoberfest-accepted
- color: "a2eeef"
description: This issue or pull request will add or improve functionality, maintainability, or ease of use
name: improvement
- color: "fef2c0"
description: This issue or pull request is not applicable, incorrect, or obsolete
name: invalid
- color: "ce099a"
description: This pull request is ready to merge during the next Lineage Kraken release
name: kraken 🐙
- color: "a4fc5d"
description: This issue or pull request requires further information
name: need info
- color: "fcdb45"
description: This pull request is awaiting an action or decision to move forward
name: on hold
- color: "3772a4"
description: Pull requests that update Python code
name: python
- color: "ef476c"
description: This issue is a request for information or needs discussion
name: question
- color: "00008b"
description: This issue or pull request adds or otherwise modifies test code
name: test
- color: "1d76db"
description: This issue or pull request pulls in upstream updates
name: upstream update
- color: "d4c5f9"
description: This issue or pull request increments the version number
name: version bump
- color: "ffffff"
description: This issue will not be incorporated
name: wontfix
116 changes: 97 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,24 @@ jobs:
uses: cisagov/setup-env-github-action@develop
- uses: actions/checkout@v3
- id: setup-python
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: "3.10"
# We need the Go version and Go cache location for the actions/cache step,
# so the Go installation must happen before that.
- uses: actions/setup-go@v2
- id: setup-go
uses: actions/setup-go@v3
with:
go-version: "1.16"
- name: Store installed Go version
id: go-version
run: |
echo "::set-output name=version::"\
"$(go version | sed 's/^go version go\([0-9.]\+\) .*/\1/')"
go-version: "1.19"
- name: Lookup Go cache directory
id: go-cache
run: |
echo "::set-output name=dir::$(go env GOCACHE)"
echo "dir=$(go env GOCACHE)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
env:
BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
py${{ steps.setup-python.outputs.python-version }}-\
go${{ steps.go-version.outputs.version }}-\
go${{ steps.setup-go.outputs.go-version }}-\
packer${{ steps.setup-env.outputs.packer-version }}-\
tf${{ steps.setup-env.outputs.terraform-version }}-"
with:
Expand Down Expand Up @@ -82,7 +78,7 @@ jobs:
${{ env.CURL_CACHE_DIR }}/"${PACKER_ZIP}"
sudo mv /usr/local/bin/packer /usr/local/bin/packer-default
sudo ln -s /opt/packer/packer /usr/local/bin/packer
- uses: hashicorp/setup-terraform@v1
- uses: hashicorp/setup-terraform@v2
with:
terraform_version: ${{ steps.setup-env.outputs.terraform-version }}
- name: Install shfmt
Expand All @@ -107,16 +103,28 @@ jobs:
uses: mxschmitt/action-tmate@v3
if: env.RUN_TMATE
test:
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os:
- ubuntu-latest
python-version:
<<<<<<< HEAD
=======
- "3.7"
- "3.8"
- "3.9"
>>>>>>> 65604c7e134491f497f612f6eaebded8f411bec5
- "3.10"
- "3.11"
include:
- os: ubuntu-20.04
python-version: "3.6"
steps:
- uses: actions/checkout@v3
- id: setup-python
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- uses: actions/cache@v3
Expand Down Expand Up @@ -155,11 +163,12 @@ jobs:
if: env.RUN_TMATE
coveralls-finish:
runs-on: ubuntu-latest
needs: test
needs:
- test
steps:
- uses: actions/checkout@v3
- id: setup-python
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: "3.10"
- uses: actions/cache@v3
Expand Down Expand Up @@ -189,17 +198,31 @@ jobs:
uses: mxschmitt/action-tmate@v3
if: env.RUN_TMATE
build:
runs-on: ubuntu-latest
needs: [lint, test]
runs-on: ${{ matrix.os }}
needs:
- lint
- test
strategy:
fail-fast: false
matrix:
os:
- ubuntu-latest
python-version:
<<<<<<< HEAD
=======
- "3.7"
- "3.8"
- "3.9"
>>>>>>> 65604c7e134491f497f612f6eaebded8f411bec5
- "3.10"
- "3.11"
include:
- os: ubuntu-20.04
python-version: "3.6"
steps:
- uses: actions/checkout@v3
- id: setup-python
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- uses: actions/cache@v3
Expand All @@ -223,10 +246,65 @@ jobs:
- name: Build artifacts
run: python -m build
- name: Upload artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: dist-${{ matrix.python-version }}
path: dist
- name: Setup tmate debug session
uses: mxschmitt/action-tmate@v3
if: env.RUN_TMATE
test-build:
runs-on: ${{ matrix.os }}
needs:
- build
strategy:
fail-fast: false
matrix:
os:
- ubuntu-latest
python-version:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
include:
- os: ubuntu-20.04
python-version: "3.6"
steps:
- uses: actions/checkout@v3
- id: setup-python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- uses: actions/cache@v3
env:
BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
py${{ steps.setup-python.outputs.python-version }}-"
with:
path: ${{ env.PIP_CACHE_DIR }}
# We do not use '**/setup.py' in the cache key so only the 'setup.py'
# file in the root of the repository is used. This is in case a Python
# package were to have a 'setup.py' as part of its internal codebase.
key: "${{ env.BASE_CACHE_KEY }}\
${{ hashFiles('**/requirements.txt') }}-\
${{ hashFiles('setup.py') }}"
restore-keys: |
${{ env.BASE_CACHE_KEY }}
- name: Retrieve the built wheel
uses: actions/download-artifact@v3
with:
name: dist-${{ matrix.python-version }}
- name: Install testing dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade pytest pytest-cov
- name: Install the built wheel (there should only be one)
run: python -m pip install *.whl
- name: Run tests
env:
RELEASE_TAG: ${{ github.event.release.tag_name }}
run: pytest
- name: Setup tmate debug session
uses: mxschmitt/action-tmate@v3
if: env.RUN_TMATE
29 changes: 29 additions & 0 deletions .github/workflows/sync-labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
name: sync-labels

on:
push:
paths:
- '.github/labels.yml'
- '.github/workflows/sync-labels.yml'

permissions:
contents: read

jobs:
labeler:
permissions:
# actions/checkout needs this to fetch code
contents: read
# crazy-max/ghaction-github-labeler needs this to manage repository labels
issues: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Sync repository labels
if: success()
uses: crazy-max/ghaction-github-labeler@v4
with:
# This is a hideous ternary equivalent so we only do a dry run unless
# this workflow is triggered by the develop branch.
dry-run: ${{ github.ref_name == 'develop' && 'false' || 'true' }}
Loading