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

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

Merged
merged 71 commits into from
Jul 31, 2023
Merged

Commits on Mar 24, 2023

  1. Configuration menu
    Copy the full SHA
    744f07e View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2023

  1. Configuration menu
    Copy the full SHA
    3eed760 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Use Python 3.11 for the lint job in the build workflow

    This is the latest minor release of Python so it makes sense to use it
    as the default for this job.
    mcdonnnj committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    8d39c8b View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. Merge pull request #130 from cisagov/improvement/update_python_versio…

    …n_for_lint_job
    
    Use Python 3.11 for the `lint` job in the `build` workflow
    jmorrowomni authored Apr 20, 2023
    Configuration menu
    Copy the full SHA
    5f4b768 View commit details
    Browse the repository at this point in the history
  2. Update pre-commit hook versions

    This is done automatically with the `pre-commit autoupdate` command.
    However the `ansible-lint` hook is manually kept back as we have not
    tested functionality to confirm that our roles will generally pass
    with the new version.
    mcdonnnj authored and jmorrowomni committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    db5e7ff View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c9028cf View commit details
    Browse the repository at this point in the history
  4. Bump actions/setup-go from 3 to 4

    Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3 to 4.
    - [Release notes](https://github.com/actions/setup-go/releases)
    - [Commits](actions/setup-go@v3...v4)
    
    ---
    updated-dependencies:
    - dependency-name: actions/setup-go
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and jmorrowomni committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    4c595e6 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #127 from cisagov/dependabot/github_actions/action…

    …s/setup-go-4
    
    Bump actions/setup-go from 3 to 4
    jmorrowomni authored Apr 20, 2023
    Configuration menu
    Copy the full SHA
    847cd13 View commit details
    Browse the repository at this point in the history
  6. Install/upgrade setuptools and wheel when upgrading pip

    When wheel gets installed alongside other packages, it may not get
    used when those other packages are installed.  When that happens I see
    warnings like this:
      DEPRECATION: ansible-core is being installed using the legacy
      'setup.py install' method, because it does not have a
      'pyproject.toml' and the 'wheel' package is not installed. pip 23.1
      will enforce this behaviour change. A possible replacement is to
      enable the '--use-pep517' option. Discussion can be found at
      pypa/pip#8559
    
    This change should get rid of these warnings.
    
    Nota bene: This is the practice we follow in the Dockerfile in
    cisagov/skeleton-docker, but for some reason we never started using it
    in our workflows.
    jsf9k authored and jmorrowomni committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    9984792 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #126 from cisagov/improvement/install-setuptools-a…

    …nd-wheel-with-pip
    
    Install/upgrade setuptools and wheel when upgrading pip
    jmorrowomni authored Apr 20, 2023
    Configuration menu
    Copy the full SHA
    7250368 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. Configuration menu
    Copy the full SHA
    a0bc20b View commit details
    Browse the repository at this point in the history
  2. Add Staticcheck

    jasonodoom committed May 5, 2023
    Configuration menu
    Copy the full SHA
    3628e5f View commit details
    Browse the repository at this point in the history
  3. Fix indentation

    Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
    jasonodoom and jsf9k authored May 5, 2023
    Configuration menu
    Copy the full SHA
    668724f View commit details
    Browse the repository at this point in the history
  4. Fix indentation

    Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
    jasonodoom and jsf9k authored May 5, 2023
    Configuration menu
    Copy the full SHA
    3d422b8 View commit details
    Browse the repository at this point in the history
  5. Fix indentation

    Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
    jasonodoom and jsf9k authored May 5, 2023
    Configuration menu
    Copy the full SHA
    5571f47 View commit details
    Browse the repository at this point in the history
  6. Fix formatting

    Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
    jasonodoom and jsf9k authored May 5, 2023
    Configuration menu
    Copy the full SHA
    4fd9501 View commit details
    Browse the repository at this point in the history
  7. Fix formatting

    Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
    jasonodoom and jsf9k authored May 5, 2023
    Configuration menu
    Copy the full SHA
    412101a View commit details
    Browse the repository at this point in the history
  8. Fix formatting

    Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
    jasonodoom and jsf9k authored May 5, 2023
    Configuration menu
    Copy the full SHA
    a346fb5 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    c47038b View commit details
    Browse the repository at this point in the history
  10. Fix formatting

    jasonodoom committed May 5, 2023
    Configuration menu
    Copy the full SHA
    eb52678 View commit details
    Browse the repository at this point in the history
  11. Remove extra hook ids

    jasonodoom committed May 5, 2023
    Configuration menu
    Copy the full SHA
    f8179f1 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2023

  1. Configuration menu
    Copy the full SHA
    42820e2 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. Remove the go-lint hook from the pre-commit configuration

    The golang/lint tool was archived on May 9th, 2021 and based on
    golang/go#38968 no future work is planned. Coupled with the fact that
    it is not available from brew we are removing this hook as local
    development may be hindered by trying to satisfy running this hook.
    
    Co-authored-by: Shane Frasier <jeremy.frasier@gwe.cisa.dhs.gov>
    Co-authored-by: dav3r <david.redmin@gwe.cisa.dhs.gov>
    3 people committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    7f372e6 View commit details
    Browse the repository at this point in the history
  2. Update pre-commit hook versions

    This is done automatically with the `pre-commit autoupdate` command.
    mcdonnnj authored and jmorrowomni committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    b823111 View commit details
    Browse the repository at this point in the history
  3. Add apostrophe to Qapla

    jasonodoom authored and jmorrowomni committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    b770fc6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    24a0008 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f01965a View commit details
    Browse the repository at this point in the history
  6. Fix two broken links

    jsf9k authored and jmorrowomni committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    43d588f View commit details
    Browse the repository at this point in the history
  7. Disable caching for the setup-go Action

    The cache key used relies on the existence of a go.sum file. Since we
    have no expectation for Go source code, including that file, and since
    we already include the Go cache in our job caching, we can safely
    disable caching in the Action.
    mcdonnnj authored and jmorrowomni committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    e098255 View commit details
    Browse the repository at this point in the history
  8. Bump Go from 1.19 to 1.20

    Bump the version of Go used in our GitHub Actions configuration to the
    latest stable Go release.
    mcdonnnj authored and jmorrowomni committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    edf1338 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. Configuration menu
    Copy the full SHA
    42f481c View commit details
    Browse the repository at this point in the history
  2. Merge pull request #133 from cisagov/add-go-hooks

    Add Go hooks
    mcdonnnj authored Jun 8, 2023
    Configuration menu
    Copy the full SHA
    bd762fe View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. Configuration menu
    Copy the full SHA
    af90040 View commit details
    Browse the repository at this point in the history
  2. Use Python 3.11 for the lint job in the build workflow

    This is the latest minor release of Python so it makes sense to use it
    as the default for this job.
    mcdonnnj authored and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    f037c16 View commit details
    Browse the repository at this point in the history
  3. Update pre-commit hook versions

    This is done automatically with the `pre-commit autoupdate` command.
    However the `ansible-lint` hook is manually kept back as we have not
    tested functionality to confirm that our roles will generally pass
    with the new version.
    mcdonnnj authored and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    92d7a39 View commit details
    Browse the repository at this point in the history
  4. Bump actions/setup-go from 3 to 4

    Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3 to 4.
    - [Release notes](https://github.com/actions/setup-go/releases)
    - [Commits](actions/setup-go@v3...v4)
    
    ---
    updated-dependencies:
    - dependency-name: actions/setup-go
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    e30ba2e View commit details
    Browse the repository at this point in the history
  5. Install/upgrade setuptools and wheel when upgrading pip

    When wheel gets installed alongside other packages, it may not get
    used when those other packages are installed.  When that happens I see
    warnings like this:
      DEPRECATION: ansible-core is being installed using the legacy
      'setup.py install' method, because it does not have a
      'pyproject.toml' and the 'wheel' package is not installed. pip 23.1
      will enforce this behaviour change. A possible replacement is to
      enable the '--use-pep517' option. Discussion can be found at
      pypa/pip#8559
    
    This change should get rid of these warnings.
    
    Nota bene: This is the practice we follow in the Dockerfile in
    cisagov/skeleton-docker, but for some reason we never started using it
    in our workflows.
    jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    f3da594 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    46896a8 View commit details
    Browse the repository at this point in the history
  7. Add Staticcheck

    jasonodoom authored and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    ff0ebdf View commit details
    Browse the repository at this point in the history
  8. Fix indentation

    Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
    jasonodoom and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    f953e8e View commit details
    Browse the repository at this point in the history
  9. Fix indentation

    Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
    jasonodoom and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    932b62e View commit details
    Browse the repository at this point in the history
  10. Fix indentation

    Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
    jasonodoom and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    2eca0cd View commit details
    Browse the repository at this point in the history
  11. Fix formatting

    Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
    jasonodoom and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    fab2344 View commit details
    Browse the repository at this point in the history
  12. Fix formatting

    Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
    jasonodoom and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    892673b View commit details
    Browse the repository at this point in the history
  13. Fix formatting

    Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
    jasonodoom and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    0d77207 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    b661316 View commit details
    Browse the repository at this point in the history
  15. Fix formatting

    jasonodoom authored and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    6a40279 View commit details
    Browse the repository at this point in the history
  16. Remove extra hook ids

    jasonodoom authored and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    b0f2bf3 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    a93f6d4 View commit details
    Browse the repository at this point in the history
  18. Remove the go-lint hook from the pre-commit configuration

    The golang/lint tool was archived on May 9th, 2021 and based on
    golang/go#38968 no future work is planned. Coupled with the fact that
    it is not available from brew we are removing this hook as local
    development may be hindered by trying to satisfy running this hook.
    
    Co-authored-by: Shane Frasier <jeremy.frasier@gwe.cisa.dhs.gov>
    Co-authored-by: dav3r <david.redmin@gwe.cisa.dhs.gov>
    3 people committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    ec058ef View commit details
    Browse the repository at this point in the history
  19. Update pre-commit hook versions

    This is done automatically with the `pre-commit autoupdate` command.
    mcdonnnj authored and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    033e194 View commit details
    Browse the repository at this point in the history
  20. Add apostrophe to Qapla

    jasonodoom authored and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    43a4bd1 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    7bfd06c View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    6030c9a View commit details
    Browse the repository at this point in the history
  23. Fix two broken links

    jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    2122a39 View commit details
    Browse the repository at this point in the history
  24. Disable caching for the setup-go Action

    The cache key used relies on the existence of a go.sum file. Since we
    have no expectation for Go source code, including that file, and since
    we already include the Go cache in our job caching, we can safely
    disable caching in the Action.
    mcdonnnj authored and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    92e0e6a View commit details
    Browse the repository at this point in the history
  25. Bump Go from 1.19 to 1.20

    Bump the version of Go used in our GitHub Actions configuration to the
    latest stable Go release.
    mcdonnnj authored and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    2e746e2 View commit details
    Browse the repository at this point in the history
  26. Update the version of Python used in the GHA test job

    The version of Python used in the `lint` job of the build workflow for
    GitHub Actions was updated to 3.11 so we should update the `test` job
    to match.
    mcdonnnj authored and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    c07be40 View commit details
    Browse the repository at this point in the history
  27. Install two additional Python packages in the GHA test job

    The `setuptools` and `wheel` packages were added to the `lint` job in
    GitHub Actions and it should be duplicated for the `test` job.
    mcdonnnj authored and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    2a16326 View commit details
    Browse the repository at this point in the history
  28. Bump python from 3.10.1-alpine to 3.11.4-alpine

    Bumps python from 3.10.1-alpine to 3.11.4-alpine.
    
    ---
    updated-dependencies:
    - dependency-name: python
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and jsf9k committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    8237d27 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    7aeeb5e View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    cf24b08 View commit details
    Browse the repository at this point in the history
  31. Merge pull request #166 from cisagov/lineage/skeleton

    Lineage pull request for: skeleton
    jsf9k authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    8c26a61 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Merge https://github.com/cisagov/skeleton-docker into lineage/skeleton

    # Conflicts:
    #	Dockerfile
    mcdonnnj committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    ce47459 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. Migrate testing from pytest-dockerc to using python-on-whales

    The pytest-dockerc plug is unmaintained and there is now a dependency
    issues with PyYAML because of the release of Cython v3 (which is itself
    a build dependency for PyYAML). After some research this seemed like
    the most similar package in terms of functionality to the package we
    are replacing. Although it is not a pytest plugin it still provides
    similar access and uses the Docker composition defined in the
    repository.
    mcdonnnj committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    c02e483 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. Merge pull request #167 from cisagov/improvement/update_testing_method

    Switch packages used to test the configuration
    jsf9k authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    a9d6c92 View commit details
    Browse the repository at this point in the history
  2. Merge https://github.com/cisagov/skeleton-docker into lineage/skeleton

    # Conflicts:
    #	tests/container_test.py
    mcdonnnj committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    a616ae6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0c45c44 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c160bb0 View commit details
    Browse the repository at this point in the history
  5. Upgrade the version of the libpq-dev package installed

    13.11-0+deb11u1 is the latest release for Debian Bullseye.
    jsf9k committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    144dae7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e437251 View commit details
    Browse the repository at this point in the history