diff --git a/.gitignore b/.gitignore index 2286fca..f32c742 100644 --- a/.gitignore +++ b/.gitignore @@ -95,4 +95,5 @@ ENV/ # moban hashes .moban.hashes +.DS_store diff --git a/.moban.d/setup.py b/.moban.d/setup.py index 7ae48c7..179d330 100644 --- a/.moban.d/setup.py +++ b/.moban.d/setup.py @@ -1,4 +1,4 @@ -{%extends "setup.py.jj2"%} +{%extends "pyexcel-setup.py.jj2"%} {%block platform_block%} -{%endblock%} \ No newline at end of file +{%endblock%} diff --git a/.travis.yml b/.travis.yml index 8895978..2f4dbf8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,6 @@ python: - 3.3 - 2.7 before_install: - - cd $HOME - - "if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then deactivate && wget https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.7.1-linux_x86_64-portable.tar.bz2 -O - | tar -jxf - && echo 'Setting up aliases...' && ln -s pypy-5.7.1-linux_x86_64-portable pypy2-latest && export PATH=$HOME/pypy2-latest/bin/:$PATH && virtualenv --no-site-packages --python ~/pypy2-latest/bin/pypy pypy2-env && echo 'Creating custom env...' && source pypy2-env/bin/activate && python -V; fi" - - cd - - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi - if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then mv min_requirements.txt requirements.txt ; diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bab9edd..7f633c0 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,7 @@ Change log =========== -0.0.1 - unreleased +0.0.1 - 19/07/2017 -------------------------------------------------------------------------------- Initial release diff --git a/README.rst b/README.rst index ef5a39d..642b19e 100644 --- a/README.rst +++ b/README.rst @@ -120,9 +120,9 @@ and update CHANGELOG.rst. .. note:: As to rnd_requirements.txt, usually, it is created when a dependent - library is not released. Once the dependecy is installed - (will be released), the future - version of the dependency in the requirements.txt will be valid. + library is not released. Once the dependecy is installed + (will be released), the future + version of the dependency in the requirements.txt will be valid. How to test your contribution @@ -144,6 +144,7 @@ How to update test environment and update documentation Additional steps are required: #. pip install moban +#. git clone https://github.com/moremoban/setupmobans.git # generic setup #. git clone https://github.com/pyexcel/pyexcel-commons.git commons #. make your changes in `.moban.d` directory, then issue command `moban` @@ -164,11 +165,12 @@ Acceptance criteria #. Has all code lines tested #. Passes all Travis CI builds #. Has fair amount of documentation if your change is complex +#. Please update CHANGELOG.rst +#. Please add yourself to CONTRIBUTORS.rst #. Agree on NEW BSD License for your contribution - License ================================================================================ diff --git a/commons b/commons deleted file mode 120000 index 0a8a02d..0000000 --- a/commons +++ /dev/null @@ -1 +0,0 @@ -../pyexcel-commons/ \ No newline at end of file diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..8c8abfd --- /dev/null +++ b/setup.cfg @@ -0,0 +1,4 @@ +[metadata] +description-file = README.rst +[bdist_wheel] +universal = 1 diff --git a/setup.py b/setup.py index dce4464..1686236 100644 --- a/setup.py +++ b/setup.py @@ -17,11 +17,11 @@ 'draws gantt chart using frappe-gantt.js for pyexcel data' + '' ) +URL = 'https://github.com/pyexcel/pyexcel-gantt' +DOWNLOAD_URL = '%s/archive/0.0.1.tar.gz' % URL FILES = ['README.rst', 'CHANGELOG.rst'] KEYWORDS = [ - 'excel', - 'python', - 'pyexcel', + 'python' ] CLASSIFIERS = [ @@ -29,7 +29,6 @@ 'Topic :: Utilities', 'Topic :: Software Development :: Libraries', 'Programming Language :: Python', - 'License :: OSI Approved :: BSD License', 'Intended Audience :: Developers', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', @@ -37,6 +36,7 @@ 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'License :: OSI Approved :: BSD License', ] INSTALL_REQUIRES = [ @@ -83,7 +83,11 @@ def filter_out_test_code(file_handle): found_test_code = False yield line else: - yield line + for keyword in ['|version|', '|today|']: + if keyword in line: + break + else: + yield line if __name__ == '__main__': @@ -93,6 +97,8 @@ def filter_out_test_code(file_handle): version=VERSION, author_email=EMAIL, description=DESCRIPTION, + url=URL, + download_url=DOWNLOAD_URL, long_description=read_files(*FILES), license=LICENSE, keywords=KEYWORDS, diff --git a/setupmobans b/setupmobans deleted file mode 120000 index e150720..0000000 --- a/setupmobans +++ /dev/null @@ -1 +0,0 @@ -../setupmobans/ \ No newline at end of file