Skip to content

Commit 6e29f48

Browse files
authored
Merge pull request #15 from fosslight/develop
1. add to check the lastest package version 2. Use fosslight_dependency and refactoring the code 3. modify to be written in one line in multi license (gradle) 4. change the cocoapods homepage to https://cocoapods.org/pods/(oss name)
2 parents f30c554 + ede30f0 commit 6e29f48

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+205
-280
lines changed

build.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
block_cipher = None
44

55

6-
a = Analysis(['unified_script\\dependency_unified.py'],
6+
a = Analysis(['src\\fosslight_dependency\\analyze_dependency.py'],
77
pathex=['C:\\Users\\dd-jy\\pythonProject\\fosslight_dependency'],
8-
binaries=[('unified_script\\third_party\\askalono\\askalono.exe', 'third_party\\askalono')],
8+
binaries=[('src\\fosslight_dependency\\third_party\\askalono\\askalono.exe', 'third_party\\askalono')],
99
datas=[],
1010
hiddenimports=[],
1111
hookspath=[],

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ openpyxl
22
beautifulsoup4
33
lxml
44
virtualenv
5-
requests
65
pyyaml
6+
lastversion
7+
fosslight_util

setup.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,35 @@
77
from codecs import open
88
from setuptools import setup, find_packages
99

10-
with open('requirements.txt') as f:
10+
with open('requirements.txt', 'r') as f:
1111
required = f.read()
1212

13-
with open("README.md", "r") as fh:
13+
with open('README.md', 'r') as fh:
1414
long_description = fh.read()
1515

16+
exec(open("src/fosslight_dependency/_version.py").read())
17+
1618
if __name__ == "__main__":
1719
setup(
1820
name = 'fosslight_dependency',
19-
version = '3.0.6',
20-
packages = find_packages(),
21+
version = __version__,
22+
package_dir = {"": "src"},
23+
packages = find_packages(where='src'),
2124
description = 'FOSSLight Dependency',
2225
long_description = long_description,
2326
long_description_content_type = 'text/markdown',
2427
license = 'Apache-2.0',
2528
author = 'LG Electronics',
2629
url = 'https://github.com/fosslight/fosslight_dependency',
30+
download_url = 'https://github.com/fosslight/fosslight_dependency',
2731
classifiers = ['Programming Language :: Python :: 3.6',
2832
'License :: OSI Approved :: Apache Software License'],
2933
install_requires = required,
30-
package_data = {'unified_script':['third_party/nomos/nomossa','third_party/askalono/askalono.exe','third_party/askalono/askalono_macos']},
34+
package_data = {'fosslight_dependency':['third_party/nomos/nomossa','third_party/askalono/askalono.exe','third_party/askalono/askalono_macos']},
3135
include_package_data = True,
3236
entry_points = {
3337
"console_scripts": [
34-
"fosslight_dependency=unified_script.dependency_unified:main"
38+
"fosslight_dependency = fosslight_dependency.analyze_dependency:main"
3539
]
3640
}
3741
)

src/fosslight_dependency/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from ._version import __version__

src/fosslight_dependency/_version.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__version__ = "3.0.7"

0 commit comments

Comments
 (0)