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
Fix check for requirements (#7534), add missing dependencies #7537
Merged
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
c823a9b
Fix check for requirements (#7534), start adding missing dependencies
iarspider 15b2517
Fix EOLs
iarspider 07ae1c2
Try fixing rust spec
iarspider 4eab3a9
Try fixing rust spec
iarspider 5c5b724
Fixed rust.spec
iarspider 344c491
Done py3-keyring and dependenices
iarspider 18d62e0
Fix missing dependencies of python packages
iarspider 8583d1d
Add missing built-time dependencies for py3-correctionlib
iarspider cdd1594
Fix case
iarspider 33e8450
added rust 1.57.0
smuzaffar 9b78386
just to make sure that rust is build with PRs
smuzaffar 70a8564
Update rust.spec
smuzaffar 2ef29cc
Fix EOL
iarspider 8f916d4
Merge remote-tracking branch 'origin/rust-1.57' into fix-py-deps
iarspider c5ddec6
Add missing files
iarspider afca97d
Apply changes from review
iarspider 458def2
Fix py3-GitPython requirements
iarspider c8edfc2
Remove py3-smmap2
iarspider 77378cd
Fixes for py3-jinja2-tome and py3-opt-einsum
iarspider bdaf12d
Remove py3-cmake
iarspider 722f517
Revert changes to build-with-pip.file
iarspider File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
Requires: py3-smmap2 py3-gitdb | ||
Requires: py3-gitdb py3-typing-extensions |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Requires: py3-cffi |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
Requires: py3-scipy | ||
Requires: py3-scipy py3-six |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Requires: py3-python-dateutil |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
%define patchsrc0 sed -i -e 's|name="CacheControl"|name="cachecontrol"|' setup.py | ||
Requires: py3-setuptools py3-msgpack py3-requests |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
Requires: py3-pybind11 py3-numpy py3-pydantic py3-python-rapidjson py3-rich | ||
BuildRequires: py3-setuptools-scm py3-scikit-build cmake | ||
BuildRequires: py3-setuptools-scm py3-scikit-build cmake py3-make | ||
%define PipPreBuildPy export CMAKE_BUILD_PARALLEL_LEVEL=%{compiling_processes} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
%define PipPreBuild export CARGO_HOME=%{_tmppath}/cargo_home | ||
BuildRequires: rust | ||
Requires: py3-setuptools-rust py3-cffi | ||
iarspider marked this conversation as resolved.
Show resolved
Hide resolved
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Requires: py3-wrapt |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Requires: py3-flit-core |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Requires: py3-arrow py3-Jinja2 |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Requires: py3-setuptools-scm py3-importlib-metadata py3-secretstorage py3-jeepney |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
%define tag ce2ef5834837a35dba5f2bea8866b61c8907c83a | ||
%define branch master | ||
%define github_user fholmer | ||
%define source0 git+https://github.com/%{github_user}/make.git?obj=%{branch}/%{tag}&export=make-%{realversion}&output=/source.tar.gz | ||
|
||
Requires: py3-Jinja2 py3-jinja2-time |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
%define source0 https://github.com/dgasmith/opt_einsum/archive/v%{realversion}.tar.gz | ||
Requires: py3-numpy |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Requires: py3-deprecated py3-PyJWT py3-PyNaCl py3-requests |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Requires: py3-cryptography py3-jeepney |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
BuildRequires: rust | ||
Requires: py3-setuptools-scm py3-semantic-version py3-toml py3-typing-extensions |
This file was deleted.
Oops, something went wrong.
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
### RPM external rust 1.57.0 | ||
%ifarch ppc64le | ||
%define build_arch powerpc64le-unknown-linux-gnu | ||
%else | ||
%define build_arch %{_arch}-unknown-linux-gnu | ||
%endif | ||
%define github_user rust-lang | ||
%define branch master | ||
%define tag %{realversion} | ||
Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz | ||
BuildRequires: python3 | ||
Requires: llvm | ||
|
||
%prep | ||
%setup -n %{n}-%{realversion} | ||
|
||
%build | ||
cat << EOF > config.toml | ||
[llvm] | ||
link-shared = true | ||
|
||
[build] | ||
docs = false | ||
build = "%{build_arch}" | ||
extended = true | ||
|
||
[install] | ||
prefix = "%i" | ||
sysconfdir = "etc" | ||
|
||
[rust] | ||
channel = "stable" | ||
rpath = false | ||
codegen-tests = false | ||
|
||
[target.%{build_arch}] | ||
llvm-config = "${LLVM_ROOT}/bin/llvm-config" | ||
EOF | ||
|
||
mkdir -p %{_tmppath}/cargo_home | ||
export CARGO_HOME=%{_tmppath}/cargo_home | ||
python3 ./x.py build -vv --exclude src/tools/miri %{makeprocesses} | ||
|
||
%install | ||
export CARGO_HOME=%{_tmppath}/cargo_home | ||
export RUSTUP_HOME=%{i} | ||
python3 ./x.py install -vv --exclude src/tools/miri %{makeprocesses} | ||
chmod 0755 %i/lib//librustc_driver*.so |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we need py3-make ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Technically, yes. Actually - not sure.