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

Rename py2-dablooms to dablooms. Remove dablooms python binding. #5315

Merged
merged 3 commits into from Nov 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions cmssw-tool-conf.spec
Expand Up @@ -161,6 +161,7 @@ Requires: dasgoclient
Requires: OpenBLAS-toolfile
Requires: mxnet-predict-toolfile
Requires: mkfit-toolfile
Requires: dablooms-toolfile

# Only for Linux platform.
%if %islinux
Expand Down
22 changes: 22 additions & 0 deletions dablooms-toolfile.spec
@@ -0,0 +1,22 @@
### RPM external dablooms-toolfile 1.0
Requires: dablooms

%prep

%build

%install

mkdir -p %{i}/etc/scram.d
cat << \EOF_TOOLFILE >%{i}/etc/scram.d/dablooms.xml
<tool name="dablooms" version="@TOOL_VERSION@">
<lib name="dablooms"/>
<client>
<environment name="DABLOOMS_BASE" default="@TOOL_ROOT@"/>
<environment name="LIBDIR" default="$DABLOOMS_BASE/lib"/>
<environment name="INCLUDE" default="$DABLOOMS_BASE/include"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gartung , looks like you are missing LIBDIR here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. I must have picked it up because py2-dablooms was configured and linked libdablooms into external.

Copy link
Member Author

@gartung gartung Nov 1, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And I didn't reconfigure externals when I did scram setup dablooms.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The library was picked up from CMSSW_RELEASE_BASE externals.

</client>
</tool>
EOF_TOOLFILE

## IMPORT scram-tools-post
12 changes: 12 additions & 0 deletions dablooms.spec
@@ -0,0 +1,12 @@
### RPM external dablooms 0.9.1

Source: https://github.com/bitly/dablooms/archive/v%realversion.tar.gz

%prep
%setup -n dablooms-%realversion

%build
make all

%install
make install prefix=%i
22 changes: 0 additions & 22 deletions py2-dablooms-toolfile.spec

This file was deleted.

15 changes: 0 additions & 15 deletions py2-dablooms.spec

This file was deleted.

1 change: 0 additions & 1 deletion python_tools.spec
Expand Up @@ -137,7 +137,6 @@ Requires: py2-matplotlib
Requires: py2-numpy-toolfile
Requires: py2-sqlalchemy
Requires: py2-pygithub
Requires: py2-dablooms-toolfile
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need a cmssw PR to go with this change. It will fail PR tests and IBs due to missing dablooms

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am working on a coordinated change to StaticAnalyzers.

Requires: py2-dxr-toolfile
Requires: py2-PyYAML
Requires: py2-pylint
Expand Down