Commit c01e2f23 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Changed module name from ptds to py_tools_ds to fix bug of pip installer. Changed license.

- updated __version__ and __versionalias__
parent 868b2a6f
...@@ -28,5 +28,5 @@ deploy: ...@@ -28,5 +28,5 @@ deploy:
secure: PLEASE_REPLACE_ME secure: PLEASE_REPLACE_ME
on: on:
tags: true tags: true
repo: danschef/ptds repo: danschef/py_tools_ds
condition: $TOXENV == py27 condition: $TOXENV == py27
...@@ -15,7 +15,7 @@ Types of Contributions ...@@ -15,7 +15,7 @@ Types of Contributions
Report Bugs Report Bugs
~~~~~~~~~~~ ~~~~~~~~~~~
Report bugs at https://github.com/danschef/ptds/issues. Report bugs at https://github.com/danschef/py_tools_ds/issues.
If you are reporting a bug, please include: If you are reporting a bug, please include:
...@@ -45,7 +45,7 @@ articles, and such. ...@@ -45,7 +45,7 @@ articles, and such.
Submit Feedback Submit Feedback
~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~
The best way to send feedback is to file an issue at https://github.com/danschef/ptds/issues. The best way to send feedback is to file an issue at https://github.com/danschef/py_tools_ds/issues.
If you are proposing a feature: If you are proposing a feature:
...@@ -57,17 +57,17 @@ If you are proposing a feature: ...@@ -57,17 +57,17 @@ If you are proposing a feature:
Get Started! Get Started!
------------ ------------
Ready to contribute? Here's how to set up `ptds` for local development. Ready to contribute? Here's how to set up `py_tools_ds` for local development.
1. Fork the `ptds` repo on GitHub. 1. Fork the `py_tools_ds` repo on GitHub.
2. Clone your fork locally:: 2. Clone your fork locally::
$ git clone git@github.com:your_name_here/ptds.git $ git clone git@github.com:your_name_here/py_tools_ds.git
3. Install your local copy into a virtualenv. Assuming you have virtualenvwrapper installed, this is how you set up your fork for local development:: 3. Install your local copy into a virtualenv. Assuming you have virtualenvwrapper installed, this is how you set up your fork for local development::
$ mkvirtualenv ptds $ mkvirtualenv py_tools_ds
$ cd ptds/ $ cd py_tools_ds/
$ python setup.py develop $ python setup.py develop
4. Create a branch for local development:: 4. Create a branch for local development::
...@@ -78,7 +78,7 @@ Ready to contribute? Here's how to set up `ptds` for local development. ...@@ -78,7 +78,7 @@ Ready to contribute? Here's how to set up `ptds` for local development.
5. When you're done making changes, check that your changes pass flake8 and the tests, including testing other Python versions with tox:: 5. When you're done making changes, check that your changes pass flake8 and the tests, including testing other Python versions with tox::
$ flake8 ptds tests $ flake8 py_tools_ds tests
$ python setup.py test or py.test $ python setup.py test or py.test
$ tox $ tox
...@@ -102,7 +102,7 @@ Before you submit a pull request, check that it meets these guidelines: ...@@ -102,7 +102,7 @@ Before you submit a pull request, check that it meets these guidelines:
your new functionality into a function with a docstring, and add the your new functionality into a function with a docstring, and add the
feature to the list in README.rst. feature to the list in README.rst.
3. The pull request should work for Python 2.6, 2.7, 3.3, 3.4 and 3.5, and for PyPy. Check 3. The pull request should work for Python 2.6, 2.7, 3.3, 3.4 and 3.5, and for PyPy. Check
https://travis-ci.org/danschef/ptds/pull_requests https://travis-ci.org/danschef/py_tools_ds/pull_requests
and make sure that the tests pass for all supported Python versions. and make sure that the tests pass for all supported Python versions.
Tips Tips
...@@ -111,4 +111,4 @@ Tips ...@@ -111,4 +111,4 @@ Tips
To run a subset of tests:: To run a subset of tests::
$ python -m unittest tests.test_ptds $ python -m unittest tests.test_py_tools_ds
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
History History
======= =======
0.1.0 (2017-05-22) 0.1.0 (2017-06-09)
------------------ ------------------
* First release on PyPI. * First release on PyPI.
GNU GENERAL PUBLIC LICENSE Apache Software License 2.0
Version 3, 29 June 2007
A collection of Python tools by Daniel Scheffler. Copyright (c) 2017, Daniel Scheffler
Copyright (C) 2017 Daniel Scheffler
This program is free software: you can redistribute it and/or modify Licensed under the Apache License, Version 2.0 (the "License");
it under the terms of the GNU General Public License as published by you may not use this file except in compliance with the License.
the Free Software Foundation, either version 3 of the License, or You may obtain a copy of the License at
(at your option) any later version.
This program is distributed in the hope that it will be useful, http://www.apache.org/licenses/LICENSE-2.0
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
...@@ -48,7 +48,7 @@ clean-test: ## remove test and coverage artifacts ...@@ -48,7 +48,7 @@ clean-test: ## remove test and coverage artifacts
rm -fr htmlcov/ rm -fr htmlcov/
lint: ## check style with flake8 lint: ## check style with flake8
flake8 ptds tests flake8 py_tools_ds tests
test: ## run tests quickly with the default Python test: ## run tests quickly with the default Python
...@@ -59,16 +59,16 @@ test-all: ## run tests on every Python version with tox ...@@ -59,16 +59,16 @@ test-all: ## run tests on every Python version with tox
coverage: ## check code coverage quickly with the default Python coverage: ## check code coverage quickly with the default Python
coverage run --source ptds setup.py test coverage run --source py_tools_ds setup.py test
coverage report -m coverage report -m
coverage html coverage html
$(BROWSER) htmlcov/index.html $(BROWSER) htmlcov/index.html
docs: ## generate Sphinx HTML documentation, including API docs docs: ## generate Sphinx HTML documentation, including API docs
rm -f docs/ptds.rst rm -f docs/py_tools_ds.rst
rm -f docs/modules.rst rm -f docs/modules.rst
sphinx-apidoc -o docs/ ptds sphinx-apidoc -o docs/ py_tools_ds
$(MAKE) -C docs clean $(MAKE) -C docs clean
$(MAKE) -C docs html $(MAKE) -C docs html
$(BROWSER) docs/_build/html/index.html $(BROWSER) docs/_build/html/index.html
......
...@@ -3,26 +3,26 @@ py_tools_ds ...@@ -3,26 +3,26 @@ py_tools_ds
=========== ===========
.. image:: https://img.shields.io/pypi/v/ptds.svg .. image:: https://img.shields.io/pypi/v/py_tools_ds.svg
:target: https://pypi.python.org/pypi/ptds :target: https://pypi.python.org/pypi/py_tools_ds
.. image:: https://img.shields.io/travis/danschef/ptds.svg .. image:: https://img.shields.io/travis/danschef/py_tools_ds.svg
:target: https://travis-ci.org/danschef/ptds :target: https://travis-ci.org/danschef/py_tools_ds
.. image:: https://readthedocs.org/projects/ptds/badge/?version=latest .. image:: https://readthedocs.org/projects/py-tools-ds/badge/?version=latest
:target: https://ptds.readthedocs.io/en/latest/?badge=latest :target: https://py-tools-ds.readthedocs.io/en/latest/?badge=latest
:alt: Documentation Status :alt: Documentation Status
.. image:: https://pyup.io/repos/github/danschef/ptds/shield.svg .. image:: https://pyup.io/repos/github/danschef/py_tools_ds/shield.svg
:target: https://pyup.io/repos/github/danschef/ptds/ :target: https://pyup.io/repos/github/danschef/py_tools_ds/
:alt: Updates :alt: Updates
A collection of Python tools by Daniel Scheffler. A collection of Python tools by Daniel Scheffler.
* Free software: GNU General Public License v3 * Free software: Apache Software License 2.0
* Documentation: https://ptds.readthedocs.io. * Documentation: https://py-tools-ds.readthedocs.io.
Features Features
......
__author__='Daniel Scheffler'
from . import ptds
__all__=['ptds']
\ No newline at end of file
...@@ -85,17 +85,17 @@ qthelp: ...@@ -85,17 +85,17 @@ qthelp:
@echo @echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \ @echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:" ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/ptds.qhcp" @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/py_tools_ds.qhcp"
@echo "To view the help file:" @echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/ptds.qhc" @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/py_tools_ds.qhc"
devhelp: devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo @echo
@echo "Build finished." @echo "Build finished."
@echo "To view the help file:" @echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/ptds" @echo "# mkdir -p $$HOME/.local/share/devhelp/py_tools_ds"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/ptds" @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/py_tools_ds"
@echo "# devhelp" @echo "# devhelp"
epub: epub:
......
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# ptds documentation build configuration file, created by # py_tools_ds documentation build configuration file, created by
# sphinx-quickstart on Tue Jul 9 22:26:36 2013. # sphinx-quickstart on Tue Jul 9 22:26:36 2013.
# #
# This file is execfile()d with the current directory set to its # This file is execfile()d with the current directory set to its
...@@ -31,7 +31,7 @@ project_root = os.path.dirname(cwd) ...@@ -31,7 +31,7 @@ project_root = os.path.dirname(cwd)
# version is used. # version is used.
sys.path.insert(0, project_root) sys.path.insert(0, project_root)
import ptds import py_tools_ds
# -- General configuration --------------------------------------------- # -- General configuration ---------------------------------------------
...@@ -63,9 +63,9 @@ copyright = u"2017, Daniel Scheffler" ...@@ -63,9 +63,9 @@ copyright = u"2017, Daniel Scheffler"
# the built documents. # the built documents.
# #
# The short X.Y version. # The short X.Y version.
version = ptds.__version__ version = py_tools_ds.__version__
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = ptds.__version__ release = py_tools_ds.__version__
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
...@@ -188,7 +188,7 @@ html_static_path = ['_static'] ...@@ -188,7 +188,7 @@ html_static_path = ['_static']
#html_file_suffix = None #html_file_suffix = None
# Output file base name for HTML help builder. # Output file base name for HTML help builder.
htmlhelp_basename = 'ptdsdoc' htmlhelp_basename = 'py_tools_dsdoc'
# -- Options for LaTeX output ------------------------------------------ # -- Options for LaTeX output ------------------------------------------
...@@ -208,7 +208,7 @@ latex_elements = { ...@@ -208,7 +208,7 @@ latex_elements = {
# (source start file, target name, title, author, documentclass # (source start file, target name, title, author, documentclass
# [howto/manual]). # [howto/manual]).
latex_documents = [ latex_documents = [
('index', 'ptds.tex', ('index', 'py_tools_ds.tex',
u'py_tools_ds Documentation', u'py_tools_ds Documentation',
u'Daniel Scheffler', 'manual'), u'Daniel Scheffler', 'manual'),
] ]
...@@ -239,7 +239,7 @@ latex_documents = [ ...@@ -239,7 +239,7 @@ latex_documents = [
# One entry per manual page. List of tuples # One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section). # (source start file, name, description, authors, manual section).
man_pages = [ man_pages = [
('index', 'ptds', ('index', 'py_tools_ds',
u'py_tools_ds Documentation', u'py_tools_ds Documentation',
[u'Daniel Scheffler'], 1) [u'Daniel Scheffler'], 1)
] ]
...@@ -254,10 +254,10 @@ man_pages = [ ...@@ -254,10 +254,10 @@ man_pages = [
# (source start file, target name, title, author, # (source start file, target name, title, author,
# dir menu entry, description, category) # dir menu entry, description, category)
texinfo_documents = [ texinfo_documents = [
('index', 'ptds', ('index', 'py_tools_ds',
u'py_tools_ds Documentation', u'py_tools_ds Documentation',
u'Daniel Scheffler', u'Daniel Scheffler',
'ptds', 'py_tools_ds',
'One line description of project.', 'One line description of project.',
'Miscellaneous'), 'Miscellaneous'),
] ]
......
...@@ -12,7 +12,7 @@ To install py_tools_ds, run this command in your terminal: ...@@ -12,7 +12,7 @@ To install py_tools_ds, run this command in your terminal:
.. code-block:: console .. code-block:: console
$ pip install ptds $ pip install py_tools_ds
This is the preferred method to install py_tools_ds, as it will always install the most recent stable release. This is the preferred method to install py_tools_ds, as it will always install the most recent stable release.
...@@ -32,13 +32,13 @@ You can either clone the public repository: ...@@ -32,13 +32,13 @@ You can either clone the public repository:
.. code-block:: console .. code-block:: console
$ git clone git://github.com/danschef/ptds $ git clone git://github.com/danschef/py_tools_ds
Or download the `tarball`_: Or download the `tarball`_:
.. code-block:: console .. code-block:: console
$ curl -OL https://github.com/danschef/ptds/tarball/master $ curl -OL https://github.com/danschef/py_tools_ds/tarball/master
Once you have a copy of the source, you can install it with: Once you have a copy of the source, you can install it with:
...@@ -47,5 +47,5 @@ Once you have a copy of the source, you can install it with: ...@@ -47,5 +47,5 @@ Once you have a copy of the source, you can install it with:
$ python setup.py install $ python setup.py install
.. _Github repo: https://github.com/danschef/ptds .. _Github repo: https://github.com/danschef/py_tools_ds
.. _tarball: https://github.com/danschef/ptds/tarball/master .. _tarball: https://github.com/danschef/py_tools_ds/tarball/master
...@@ -115,9 +115,9 @@ if "%1" == "qthelp" ( ...@@ -115,9 +115,9 @@ if "%1" == "qthelp" (
echo. echo.
echo.Build finished; now you can run "qcollectiongenerator" with the ^ echo.Build finished; now you can run "qcollectiongenerator" with the ^
.qhcp project file in %BUILDDIR%/qthelp, like this: .qhcp project file in %BUILDDIR%/qthelp, like this:
echo.^> qcollectiongenerator %BUILDDIR%\qthelp\ptds.qhcp echo.^> qcollectiongenerator %BUILDDIR%\qthelp\py_tools_ds.qhcp
echo.To view the help file: echo.To view the help file:
echo.^> assistant -collectionFile %BUILDDIR%\qthelp\ptds.ghc echo.^> assistant -collectionFile %BUILDDIR%\qthelp\py_tools_ds.ghc
goto end goto end
) )
......
...@@ -4,4 +4,4 @@ Usage ...@@ -4,4 +4,4 @@ Usage
To use py_tools_ds in a project:: To use py_tools_ds in a project::
import ptds import py_tools_ds
...@@ -15,7 +15,8 @@ __all__=[#'compatibility', ...@@ -15,7 +15,8 @@ __all__=[#'compatibility',
'similarity', 'similarity',
'GeoArray'] 'GeoArray']
__version__ = '20170522_02' __version__ = '0.1.1'
__versionalias__ = '20170609_01'
__author__='Daniel Scheffler' __author__='Daniel Scheffler'
# Validate GDAL version # Validate GDAL version
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment