diff --git a/CHANGELOGS.rst b/CHANGELOGS.rst index 9d49e1a..e57c979 100644 --- a/CHANGELOGS.rst +++ b/CHANGELOGS.rst @@ -108,7 +108,7 @@ Version 0.6.0 (2015.10.30) Version 0.5.5 (2015.10.21) ^^^^^^^^^^^^^^^^^^^^^^^^^^ -- Fixed issue `#2 `_ , `#3 `_ , `#4 `_ , `#5 `_. +- Fixed issue `#2 `_ , `#3 `_ , `#4 `_ , `#5 `_. Version 0.5.2-0.5.4 (2015.10.6) diff --git a/LICENSE b/LICENSE index 2ce6071..4f0fa11 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2015, Damnever +Copyright (c) 2018, damnever All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,4 +9,4 @@ Redistribution and use in source and binary forms, with or without modification, 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README-PYPI.rst b/README-PYPI.rst index 9a2ec0d..33ae47c 100644 --- a/README-PYPI.rst +++ b/README-PYPI.rst @@ -8,7 +8,7 @@ Features -------- -- Generate requirements for project, ``pigar`` can consider all kinds of complicated situations. In this project, `py2_requirements.txt `_ and `py3_requirements.txt `_ for different python versions :: +- Generate requirements for project, ``pigar`` can consider all kinds of complicated situations. In this project, `py2_requirements.txt `_ and `py3_requirements.txt `_ for different python versions :: # Generate requirements.txt for current directory. $ pigar @@ -41,6 +41,6 @@ Features More ---- -You can find more information on `GitHub `_ . +You can find more information on `GitHub `_ . diff --git a/README.rst b/README.rst index b409a26..98b775f 100644 --- a/README.rst +++ b/README.rst @@ -8,8 +8,8 @@ Python project requirements tool – pigar :target: https://pypi.python.org/pypi/pigar -.. image:: https://raw.githubusercontent.com/Damnever/pigar/master/short-guide.gif - :target: https://raw.githubusercontent.com/Damnever/pigar/master/short-guide.gif +.. image:: https://raw.githubusercontent.com/damnever/pigar/master/short-guide.gif + :target: https://raw.githubusercontent.com/damnever/pigar/master/short-guide.gif (In the GIF, the module ``urlparse`` has been removed in Python3, ``requests`` has been installed in virtual environment ``pigar-2.7``, not in ``pigar-3.5``) @@ -17,7 +17,7 @@ Python project requirements tool – pigar Features -------- -- When generating requirements for a project, ``pigar`` can consider all kinds of complicated situations. For example, this project has `py2_requirements.txt `_ and `py3_requirements.txt `_ for different Python versions. :: +- When generating requirements for a project, ``pigar`` can consider all kinds of complicated situations. For example, this project has `py2_requirements.txt `_ and `py3_requirements.txt `_ for different Python versions. :: # Generate requirements.txt for current directory. $ pigar @@ -56,7 +56,7 @@ Installation To get the newest code from GitHub: :: - pip install git+https://github.com/Damnever/pigar.git@[master or other branch] --upgrade + pip install git+https://github.com/damnever/pigar.git@[master or other branch] --upgrade Usage ----- @@ -100,9 +100,9 @@ Also, ``pigar`` can detect the difference between different Python versions. For Finally, you already saw ``Features``. You can learn more from the source code. -If you have any issues or suggestions, `please submit an issue on GitHub `_. +If you have any issues or suggestions, `please submit an issue on GitHub `_. LICENSE ------- -`The BSD 3-Clause License `_ +`The BSD 3-Clause License `_ diff --git a/pigar/__main__.py b/pigar/__main__.py index 8ebace6..beb7b54 100644 --- a/pigar/__main__.py +++ b/pigar/__main__.py @@ -193,7 +193,7 @@ def _write_reqs(self, reqs): self._save_path))) with open(self._save_path, 'w+') as f: f.write('# Requirements automatically generated by pigar.\n' - '# https://github.com/Damnever/pigar\n') + '# https://github.com/damnever/pigar\n') for k, v in reqs.sorted_items(): f.write('\n') f.write(''.join(['# {0}\n'.format(c) diff --git a/pigar/reqs.py b/pigar/reqs.py index ffc20dc..8fccffc 100644 --- a/pigar/reqs.py +++ b/pigar/reqs.py @@ -146,7 +146,7 @@ def visit_Exec(self, node): """ if hasattr(node.body, 's'): self._str_codes.append((node.body.s, node.lineno + self._lineno)) - # PR#13: https://github.com/Damnever/pigar/pull/13 + # PR#13: https://github.com/damnever/pigar/pull/13 # Sometimes exec statement may be called with tuple in Py2.7.6 elif hasattr(node.body, 'elts') and len(node.body.elts) >= 1: self._str_codes.append( diff --git a/py2_requirements.txt b/py2_requirements.txt index a0d42a9..a9f2795 100644 --- a/py2_requirements.txt +++ b/py2_requirements.txt @@ -1,15 +1,15 @@ # Requirements automatically generated by pigar. -# https://github.com/Damnever/pigar +# https://github.com/damnever/pigar # pigar/utils.py: 10 -colorama == 0.3.7 +colorama == 0.3.9 # pigar/extractor/thread_extractor.py: 5 -futures == 3.0.5 +futures == 3.2.0 # pigar/__init__.py: 10 # pigar/extractor/gevent_extractor.py: 8 -gevent == 1.1.1 +gevent == 1.2.2 # pigar/extractor/gevent_extractor.py: 7 -greenlet == 0.4.9 +greenlet == 0.4.13 diff --git a/py3_requirements.txt b/py3_requirements.txt index 82bf61d..8cb719e 100644 --- a/py3_requirements.txt +++ b/py3_requirements.txt @@ -1,12 +1,12 @@ # Requirements automatically generated by pigar. -# https://github.com/Damnever/pigar +# https://github.com/damnever/pigar # pigar/utils.py: 10 -colorama == 0.3.7 +colorama == 0.3.9 # pigar/__init__.py: 10 # pigar/extractor/gevent_extractor.py: 8 -gevent == 1.1.1 +gevent == 1.2.2 # pigar/extractor/gevent_extractor.py: 7 -greenlet == 0.4.9 +greenlet == 0.4.12 diff --git a/setup.py b/setup.py index 0f1f5da..6709ea8 100644 --- a/setup.py +++ b/setup.py @@ -34,8 +34,8 @@ description=('A fantastic tool to generate requirements for your' ' Python project, and more than that.'), long_description=long_description + '\n\n' + change_logs, - url='https://github.com/Damnever/pigar', - author='Damnever', + url='https://github.com/damnever/pigar', + author='damnever', author_email='dxc.wolf@gmail.com', license='The BSD 3-Clause License', classifiers=[