Skip to content

Commit

Permalink
fix setup.py and rpm spec for removed files and packages (#261)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmontleon authored and djzager committed Jan 14, 2019
1 parent af3d7df commit 6e0c8fc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
8 changes: 5 additions & 3 deletions python-openshift.spec
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ Python client for the OpenShift API
#there is no include in RHEL7 setuptools find_packages
#the requirements are also done in an non-backwards compatible way
%if 0%{?rhel}
sed -i -e "s/find_packages(include='openshift.*')/['openshift', 'openshift.ansiblegen', 'openshift.client', 'openshift.client.apis', 'openshift.client.models', 'openshift.config', 'openshift.docs', 'openshift.dynamic', 'openshift.helper', 'openshift.test']/g" setup.py
sed -i -e '30s/^/REQUIRES = [\n "certifi",\n "ipaddress",\n "oauth2client",\n "setuptools",\n "six",\n "urllib3!=1.21",\n "python-dateutil",\n "pyyaml",\n "websocket-client",\n]\n/g' setup.py
sed -i -e "s/find_packages(include='openshift.*')/['openshift', 'openshift.client', 'openshift.client.apis', 'openshift.client.models', 'openshift.dynamic', 'openshift.helper']/g" setup.py
sed -i -e '30s/^/REQUIRES = [\n "dictdiffer",\n "jinja2",\n "kubernetes",\n "setuptools",\n "six",\n "ruamel.yaml",\n "python-string-utils",\n]\n/g' setup.py
sed -i -e "s/extract_requirements('requirements.txt')/REQUIRES/g" setup.py
#sed -i -e '14,21d' setup.py
%endif
Expand Down Expand Up @@ -115,7 +115,6 @@ sed -i -e "s/extract_requirements('requirements.txt')/REQUIRES/g" setup.py
%{python2_sitelib}/%{library}-*.egg-info
%exclude %{python2_sitelib}/scripts
%exclude /usr/requirements.txt/requirements.txt
%exclude /usr/custom_objects_spec.json/custom_objects_spec.json
#TODO: What about for python3?
%if %{with_python3} == 0
%{_bindir}/openshift-ansible-gen
Expand All @@ -131,6 +130,9 @@ sed -i -e "s/extract_requirements('requirements.txt')/REQUIRES/g" setup.py
%endif # with_python3

%changelog
* Sun Jan 13 2019 Jason Montleon <[email protected]> 0.9.0-1
* Update to 0.9.0

* Tue Nov 06 2018 Jason Montleon <[email protected]> 0.8.0-1
- Fix tag condition ([email protected])
- Add watch to dynamic client (#221) ([email protected])
Expand Down
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@ def extract_requirements(filename):
packages=find_packages(include='openshift.*'),
include_package_data=True,
data_files=[
('requirements.txt', ['requirements.txt']),
('custom_objects_spec.json',
['scripts/from_gen/custom_objects_spec.json']
)
('requirements.txt', ['requirements.txt'])
],
long_description='Python client for OpenShift http://openshift.redhat.com/',
classifiers=[
Expand Down

0 comments on commit 6e0c8fc

Please sign in to comment.