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

adds py2-cycler as external for matplotlib #2472

Merged
merged 4 commits into from Aug 30, 2016
Merged

adds py2-cycler as external for matplotlib #2472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cc7516
adds cycler for matplotlib
iahmad-khan Aug 30, 2016
097546a
adds py2-cycler-toolfile to cmssw-toolconf
iahmad-khan Aug 30, 2016
aad5800
adds cycler to matplotlib
iahmad-khan Aug 30, 2016
2bc7634
updates matplotlib toolfile to use cycler
iahmad-khan Aug 30, 2016
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
View file
Open in desktop
Expand Up @@ -156,6 +156,7 @@ Requires: libxslt-toolfile
Requires: py2-six-toolfile
Requires: py2-pyparsing-toolfile
Requires: py2-requests-toolfile
Requires: py2-cycler-toolfile
Requires: giflib-toolfile
Requires: freetype-toolfile
Requires: utm-toolfile
Expand Down
23 changes: 23 additions & 0 deletions py2-cycler-toolfile.spec
View file
Open in desktop
@@ -0,0 +1,23 @@
### RPM external py2-cycler-toolfile 1.0
Requires: py2-cycler
%prep

%build

%install

mkdir -p %{i}/etc/scram.d
cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-cycler.xml
<tool name="py2-cycler" version="@TOOL_VERSION@">
<info url="https://github.com/matplotlib/cycler"/>
<client>
<environment name="PY2_CYCLER" default="@TOOL_ROOT@"/>
<environment name="LIBDIR" default="$PY2_CYCLER/lib"/>
<runtime name="PYTHONPATH" value="$PY2_CYCLER/lib/python@PYTHONV@/site-packages" type="path"/>
</client>
</tool>
EOF_TOOLFILE

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

## IMPORT scram-tools-post
17 changes: 17 additions & 0 deletions py2-cycler.spec
View file
Open in desktop
@@ -0,0 +1,17 @@
### RPM external py2-cycler 0.10.0
## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
%define my_name %(echo %n | cut -f2 -d-)
Source: https://github.com/matplotlib/%my_name/archive/v%{realversion}.tar.gz

Requires: python
BuildRequires: py2-setuptools

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

%build
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
1 change: 1 addition & 0 deletions py2-matplotlib-toolfile.spec
View file
Open in desktop
Expand Up @@ -18,6 +18,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/py2-matplotlib.xml
<use name="libpng"/>
<use name="py2-numpy"/>
<use name="py2-python-dateutil"/>
<use name="py2-cycler"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 1 addition & 1 deletion py2-matplotlib.spec
View file
Open in desktop
@@ -1,7 +1,7 @@
### RPM external py2-matplotlib 1.5.2
## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
Source: https://github.com/matplotlib/matplotlib/archive/v%{realversion}.tar.gz
Requires: py2-pytz py2-numpy py2-python-dateutil zlib libpng freetype py2-pyparsing py2-six
Requires: py2-pytz py2-numpy py2-python-dateutil zlib libpng freetype py2-pyparsing py2-six py2-cycler
BuildRequires: py2-setuptools

%prep
Expand Down