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.

Sign up for GitHub

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

Jump to bottom

Remove the custom Cargo configuration #149

Merged
merged 7 commits into from
Oct 8, 2024
Merged

Remove the custom Cargo configuration #149

merged 7 commits into from
Oct 8, 2024

Commits on Oct 7, 2024

  1. Bump alpine from 3.18 to 3.20 

    This includes updating all of the system packages installed to the
versions available for Alpine Linux 3.20.
    @mcdonnnj
    mcdonnnj committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    444a0cf View commit details
    Browse the repository at this point in the history

  2. Bump python from 3.11.6-alpine3.18 to 3.12.7-alpine3.20 

    This updates the `build-stage` to match the versions of Python and
Alpine Linux used in the `compile-stage`. This also includes updating
the versions of all system packages installed.
    @mcdonnnj
    mcdonnnj committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    124abd4 View commit details
    Browse the repository at this point in the history

  3. Update the versions of Python packages installed 

    Bump the Python packages installed in the `compile-stage` as follows:
- pip from 23.1.2 to 24.2
- pipenv from 2023.10.20 to 2024.1.0
- setuptools from 67.7.2 to 75.1.0
- wheel from 0.40.0 to 0.44.0
    @mcdonnnj
    mcdonnnj committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    9285145 View commit details
    Browse the repository at this point in the history

  4. Update Python virtual environment dependencies 

    Update the version of Python declared in the Pipfile and update the
dependencies installed in the Python virtual environment by running
`pipenv lock` in the `src/` directory.
    @mcdonnnj
    mcdonnnj committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    bc01675 View commit details
    Browse the repository at this point in the history

  5. Use the --break-system-packages when installing pipenv 

    Alpine Linux 3.20 configures Python 3 as externally managed, so we need
to pass this flag to `pip` to install a Python package directly. Since we
are using this to build a Python virtual environment in the
`compile-stage` that is moved to the `build-stage` for use in the final
image this should pose no issues.
    @mcdonnnj
    mcdonnnj committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    6abaa88 View commit details
    Browse the repository at this point in the history

  6. Update the llnl-scraper version constraint in the Pipfile 

    We need some changes that were added in the LLNL/scraper repo but do
not yet have a PyPI release. Rather than continue to use a fork in our
GitHub organization it makes sense to pull in LLNL/scraper at a
specific commit until a new version is release to PyPI.
    @mcdonnnj
    mcdonnnj committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    a581e56 View commit details
    Browse the repository at this point in the history

  7. Remove the custom Cargo configuration 

    In the move from Alpine Linux 3.17 to 3.18 we also moved from Cargo
1.64.0 to 1.71.1. This takes us past 1.68, which introduced sparse
registries, and 1.70, which made `sparse` the default protocol to use
with crates.io (the default registry). This resolves #38, and based on
testing it also resolves #32.
    @mcdonnnj
    mcdonnnj committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    323eb6c View commit details
    Browse the repository at this point in the history