Skip to content

Commit 73563a4

Browse files
authored
Merge pull request #59 from fossology/chore/atarashi/uploadToPyPi
chore(atarashi): Made changes for upload to PyPi reviewed and tested by anupam.ghosh@siemens.com
2 parents d189957 + 0c6bc5d commit 73563a4

5 files changed

Lines changed: 23 additions & 16 deletions

File tree

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ before_install:
1515
- pip -V
1616

1717
install:
18+
- pip install code_comment@git+https://github.com/amanjain97/code_comment@master#egg=code_comment
1819
- pip install .
1920

2021
script:

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ WORKDIR /atarashi
2424

2525
COPY . .
2626

27-
RUN mkdir wheels \
28-
&& python -m pip wheel --use-pep517 --wheel-dir wheels .
27+
RUN mkdir wheels
28+
RUN python -m pip wheel --use-pep517 --wheel-dir wheels .
29+
RUN python -m pip wheel --use-pep517 --wheel-dir wheels code_comment@git+https://github.com/amanjain97/code_comment@master#egg=code_comment
2930

3031
FROM python:3.7-slim
3132

README.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,20 @@ http://fossology.github.io/atarashi
2121

2222
- Python >= v3.5
2323
- pip >= 18.1
24+
- `code_comments` (See installation bellow)
2425

2526
## Steps for Installation
2627

2728
### Install
2829

30+
#### Install from PyPi
31+
- Install additional depencency code-comment
32+
- `pip install code_comment@git+https://github.com/amanjain97/code_comment@master#egg=code_comment`
33+
- `pip install atarashi`
34+
35+
#### Source install
36+
- Install additional dependency code-comment
37+
- `pip install code_comment@git+https://github.com/amanjain97/code_comment@master#egg=code_comment`
2938
- `pip install .`
3039
- It will download all dependencies required and trigger build as well.
3140
- Build will generate 3 new files in your current directory
@@ -127,7 +136,7 @@ This program is distributed in the hope that it will be useful,
127136
but WITHOUT ANY WARRANTY; without even the implied warranty of
128137
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
129138
See the GNU General Public License for more details.
130-
139+
131140
You should have received a copy of the GNU General Public License
132141
along with this program; if not, write to the Free Software Foundation,
133142
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -187,6 +196,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
187196

188197
This will generate file in `docs/_build/html`. Go to: index.html
189198

190-
You can change the theme of the documentation by changing `html_theme` in config.py file in `docs/` folder.
191-
You can choose from {'alabaster', 'classic', 'sphinxdoc', 'scrolls', 'agogo', 'traditional', 'nature', 'haiku', 'pyramid', 'bizstyle'}
192-
[Reference](http://www.sphinx-doc.org/en/master/theming.html)
199+
You can change the theme of the documentation by changing `html_theme` in config.py file in `docs/` folder.
200+
You can choose from {'alabaster', 'classic', 'sphinxdoc', 'scrolls', 'agogo', 'traditional', 'nature', 'haiku', 'pyramid', 'bizstyle'}
201+
[Reference](http://www.sphinx-doc.org/en/master/theming.html)

atarashi/atarashii.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
__author__ = "Aman Jain"
3232
__email__ = "amanjain5221@gmail.com"
33-
__version__ = "0.0.9"
33+
__version__ = "0.0.10"
3434

3535

3636
def atarashii_runner(inputFile, processedLicense, agent_name, similarity="CosineSim", ngramJsonLoc=None, verbose=None):

setup.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,9 @@ def read(fname):
6666
'scipy>=0.18.1',
6767
'textdistance>=3.0.3',
6868
'pyxDamerauLevenshtein>=1.5',
69-
'code_comment@git+https://github.com/amanjain97/code_comment@master#egg=code_comment',
7069
'urllib3>=1.24.1'
7170
]
7271

73-
ext_links = [
74-
'git+https://github.com/amanjain97/code_comment.git@master#egg=code_comment'
75-
]
76-
7772
class BuildAtarashiDependencies(distutils.cmd.Command):
7873
"""
7974
Class to build dependency files for Atarashi.
@@ -115,17 +110,19 @@ def run(self):
115110

116111
metadata = dict(
117112
name = "atarashi",
118-
version = "0.0.9",
113+
version = "0.0.10",
119114
author = "Aman Jain",
120115
author_email = "amanjain5221@gmail.com",
121116
description = ("An intelligent license scanner."),
122117
license = "GPL-2.0-only",
123118
url = "https://github.com/fossology/atarashi",
124119
long_description = read('README.md'),
120+
long_description_content_type='text/markdown',
125121
classifiers = [
126-
"Development Status :: Pre-Alpha",
122+
"Development Status :: 2 - Pre-Alpha",
127123
"Topic :: Utilities",
128-
"License :: OSI Approved :: GPL v2.0 License",
124+
"Intended Audience :: Legal Industry",
125+
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)"
129126
],
130127
keywords = [
131128
"atarashi", "license", "license-scanner", "oss",
@@ -141,7 +138,6 @@ def run(self):
141138
zip_safe = False,
142139
setup_requires = build_requirements,
143140
install_requires = requirements,
144-
dependency_links = ext_links,
145141
include_package_data = True,
146142
package_data = {
147143
'atarashi': [

0 commit comments

Comments
 (0)