Remove the custom Cargo configuration #149
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mcdonnnj
added
improvement
dav3r
approved these changes
Aug 29, 2024
dv4harr10
approved these changes
Aug 29, 2024
jsf9k
approved these changes
Aug 29, 2024
jsf9k
approved these changes
Aug 29, 2024
This includes updating all of the system packages installed to the versions available for Alpine Linux 3.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.
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
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.
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.
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.
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
force-pushed
the
improvement/remove_custom_cargo_configuration
branch
from
19dcaeb
to
323eb6c
Compare
jsf9k
approved these changes
Oct 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🗣 Description
This pull request removes the custom Cargo configuration we added to this image.
Note
This pull request is built on top of #147.
💭 Motivation and context
The custom Cargo configuration was originally added to get around issues observed when trying to install the cryptography Python package on some 32-bit platforms. Since we have switched to a newer version of Alpine Linux as the base OS we also gained access to newer versions of the Rust toolchain. These newer versions both add support for the
sparseregistry protocol and make it the default for access to the defaultcrates.ioregistry which resolves #38. Since the image builds successfully without the custom configuration I believe we can also consider #32 closed.🧪 Testing
This branch has the same issue with timing out as both #146 and #147.
✅ Pre-approval checklist