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

fixes py2-h5py dependencies #2581

Merged
merged 1 commit into from Oct 14, 2016
Merged

fixes py2-h5py dependencies #2581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions cython.spec
View file
Open in desktop
Expand Up @@ -21,5 +21,3 @@ sed -ideleteme 's|#!.*/bin/python|#!/usr/bin/env python|' \
%{i}/${PYTHON_LIB_SITE_PACKAGES}/Cython/Debugger/libpython.py

find %{i} -name '*deleteme' -delete

find %{i}/${PYTHON_LIB_SITE_PACKAGES} -name '*.egg-info' -print0 | xargs -0 rm -f
4 changes: 2 additions & 2 deletions py2-h5py.spec
View file
Open in desktop
Expand Up @@ -2,8 +2,8 @@
## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
%define my_name %(echo %n | cut -f2 -d-)
Source: https://github.com/%{my_name}/%{my_name}/archive/%{realversion}.tar.gz
Requires: python py2-numpy hdf5
BuildRequires: py2-setuptools hdf5
Requires: python py2-numpy hdf5 py2-six
BuildRequires: py2-setuptools cython py2-pkgconfig
Copy link
Contributor

Choose a reason for hiding this comment

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

Have you looked into how pkgconfig is being used? We need to ensure it does not go to look into the system.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes

Copy link
Contributor

Choose a reason for hiding this comment

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

I think pkgconfig is only needed if you call setup.py test which we are not calling at build time (may be we should)


%prep
%setup -n %{my_name}-%{realversion}
Expand Down
23 changes: 23 additions & 0 deletions py2-pkgconfig-toolfile.spec
View file
Open in desktop
@@ -0,0 +1,23 @@
### RPM external py2-pkgconfig-toolfile 1.0
Requires: py2-pkgconfig
%prep

%build

%install

mkdir -p %i/etc/scram.d
cat << \EOF_TOOLFILE >%i/etc/scram.d/py2-pkgconfig.xml
<tool name="py2-pkgconfig" version="@TOOL_VERSION@">
<client>
<environment name="PY2_PKGCONFIG_BASE" default="@TOOL_ROOT@"/>
</client>
<runtime name="PYTHONPATH" value="$PY2_PKGCONFIG_BASE/lib/python@PYTHONV@/site-packages" type="path"/>
<use name="python"/>
</tool>
EOF_TOOLFILE

export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)

## IMPORT scram-tools-post

16 changes: 16 additions & 0 deletions py2-pkgconfig.spec
View file
Open in desktop
@@ -0,0 +1,16 @@
### RPM external py2-pkgconfig 1.1.0
## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES

Source: https://pypi.python.org/packages/87/35/4af9634270c00e3411cf951b7e0ea796c262922357cfc7609a86d31f072b/pkgconfig-1.1.0.tar.gz
BuildRequires: py2-setuptools
Requires: python

%prep
%setup -n pkgconfig-%{realversion}

%build
python setup.py build

%install
python setup.py install --single-version-externally-managed --record=/dev/null --skip-build --prefix=%{i}

4 changes: 2 additions & 2 deletions py2-setuptools.spec
View file
Open in desktop
@@ -1,7 +1,7 @@
### RPM external py2-setuptools 2.1
### RPM external py2-setuptools 28.3.0
## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES

Source: https://pypi.python.org/packages/source/s/setuptools/setuptools-%{realversion}.tar.gz
Source: https://pypi.python.org/packages/6b/dd/a7de8caeeffab76bacf56972b3f090c12e0ae6932245abbce706690a6436/setuptools-28.3.0.tar.gz
Requires: python

%prep
Expand Down
5 changes: 2 additions & 3 deletions py2-six.spec
View file
Open in desktop
@@ -1,7 +1,7 @@
### RPM external py2-six 1.9.0
### RPM external py2-six 1.10.0
## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
%define my_name %(echo %n | cut -f2 -d-)
Source: https://pypi.python.org/packages/source/s/six/%{my_name}-%{realversion}.tar.gz
Source: https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/six-%{realversion}.tar.gz
Requires: python
BuildRequires: py2-setuptools

Expand All @@ -13,4 +13,3 @@ python setup.py build

%install
python setup.py install --single-version-externally-managed --record=/dev/null --skip-build --prefix=%{i}
find %{i}/${PYTHON_LIB_SITE_PACKAGES} -name '*.egg-info' -print0 | xargs -0 rm -rf