Skip to content

Commit e79e1cc

Browse files
committed
Merge pull request #1 from smathot/master
Update setup scripts
2 parents 17f9bda + baa6343 commit e79e1cc

File tree

4 files changed

+38
-18
lines changed

4 files changed

+38
-18
lines changed

copyright

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2+
Upstream-Name: python-qosf
3+
Source: https://github.com/dschreij/QOpenScienceFramework
4+
5+
Files: *
6+
Copyright: Copyright 2016 Daniel Schreij <[email protected]>
7+
License: GPL-3+
8+
This program is free software; you can redistribute it
9+
and/or modify it under the terms of the GNU General Public
10+
License as published by the Free Software Foundation; either
11+
version 3 of the License, or (at your option) any later
12+
version.
13+
.
14+
This program is distributed in the hope that it will be
15+
useful, but WITHOUT ANY WARRANTY; without even the implied
16+
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
17+
PURPOSE. See the GNU General Public License for more
18+
details.
19+
.
20+
You should have received a copy of the GNU General Public
21+
License along with this package; if not, write to the Free
22+
Software Foundation, Inc., 51 Franklin St, Fifth Floor,
23+
Boston, MA 02110-1301 USA
24+
.
25+
On Debian systems, the full text of the GNU General Public
26+
License version 3 can be found in the file
27+
`/usr/share/common-licenses/GPL-3'.

setup.cfg

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[bdist_wheel]
2+
universal=1

setup.py

+1-18
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,6 @@
55
import QOpenScienceFramework
66
from setuptools import setup
77

8-
def files(path):
9-
l = [fname for fname in glob.glob(path) if os.path.isfile(fname) \
10-
and not fname.endswith('.pyc')]
11-
print(l)
12-
return l
13-
14-
15-
def data_files():
16-
return [
17-
("QOpenScienceFramework",
18-
files("QOpenScienceFramework/*")),
19-
("QOpenScienceFramework/img",
20-
files("QOpenScienceFramework/img/*")),
21-
]
22-
238
setup(
249
name="python-qosf",
2510
version=QOpenScienceFramework.__version__,
@@ -45,8 +30,6 @@ def data_files():
4530
'requests_oauthlib',
4631
'qtawesome',
4732
],
48-
include_package_data=False,
33+
include_package_data=True,
4934
packages = ['QOpenScienceFramework'],
50-
data_files=data_files()
5135
)
52-
print(data_files())

stdeb.cfg

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[DEFAULT]
2+
Source=python-qosf
3+
Package=python-qosf
4+
Debian-version=1
5+
Suite=wily
6+
Copyright-File=copyright
7+
Build-Depends=qtpy, arrow, humanize, python-fileinspector, requests_oauthlib, qtawesome
8+
Depends=qtpy, arrow, humanize, python-fileinspector, requests_oauthlib, qtawesome

0 commit comments

Comments
 (0)