Merge 8916792 into 48d1468

scikit-hep · Aug 1, 2018 · 44572b6 · 44572b6
2 parents 48d1468 + 8916792
commit 44572b6
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 143 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 Changelog
 =========
 
+0.2.0 (2018-07-24)
+------------------
+* Moved to the SciKit-HEP project.
+* Using new data package with importlib resources.
+* Better docs and examples.
+* Some method renaming
+* Generalized converter script
+
 0.1.0 (2018-03-13)
 ------------------
 

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -8,7 +8,7 @@ little bit helps, and credit will always be given.
 Bug reports
 ===========
 
-When `reporting a bug <https://github.com/henryiii/decaylanguage/issues>`_ please include:
+When `reporting a bug <https://github.com/scikit-hep/decaylanguage/issues>`_ please include:
 
     * Your operating system name and version.
     * Any details about your local setup that might be helpful in troubleshooting.
@@ -24,7 +24,7 @@ articles, and such.
 Feature requests and feedback
 =============================
 
-The best way to send feedback is to file an issue at https://github.com/henryiii/decaylanguage/issues.
+The best way to send feedback is to file an issue at https://github.com/scikit-hep/decaylanguage/issues.
 
 If you are proposing a feature:
 
@@ -37,7 +37,7 @@ Development
 
 To set up `decaylanguage` for local development:
 
-1. Fork `decaylanguage <https://github.com/henryiii/decaylanguage>`_
+1. Fork `decaylanguage <https://github.com/scikit-hep/decaylanguage>`_
    (look for the "Fork" button).
 2. Clone your fork locally::
 
@@ -74,7 +74,7 @@ For merging, you should:
 4. Add yourself to ``AUTHORS.rst``.
 
 .. [1] If you don't have all the necessary python versions available locally you can rely on Travis - it will
-       `run the tests <https://travis-ci.org/henryiii/decaylanguage/pull_requests>`_ for each change you add in the pull request.
+       `run the tests <https://travis-ci.org/scikit-hep/decaylanguage/pull_requests>`_ for each change you add in the pull request.
 
        It will be slower though ...
 

diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 [![DecayLanguage](images/DecayLanguage.png)](http://decaylanaguage.readthedocs.io/en/latest/)
 
 [![Documentation Status](https://readthedocs.org/projects/decaylanguage/badge/?style=flat)](https://readthedocs.org/projects/decaylanguage)
-[![Travis-CI Build Status](https://travis-ci.org/henryiii/decaylanguage.svg?branch=master)](https://travis-ci.org/henryiii/decaylanguage)
-[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/henryiii/decaylanguage?branch=master&svg=true)](https://ci.appveyor.com/project/HenrySchreiner/decaylanguage)
-[![Coverage Status](https://coveralls.io/repos/henryiii/decaylanguage/badge.svg?branch=master&service=github)](https://coveralls.io/github/henryiii/decaylanguage)
+[![Travis-CI Build Status](https://travis-ci.org/scikit-hep/decaylanguage.svg?branch=master)](https://travis-ci.org/scikit-hep/decaylanguage)
+[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/scikit-hep/decaylanguage?branch=master&svg=true)](https://ci.appveyor.com/project/HenrySchreiner/decaylanguage)
+[![Coverage Status](https://coveralls.io/repos/scikit-hep/decaylanguage/badge.svg?branch=master&service=github)](https://coveralls.io/github/scikit-hep/decaylanguage)
 [![PyPI Package latest release](https://img.shields.io/pypi/v/decaylanguage.svg)](https://pypi.python.org/pypi/decaylanguage)
 [![Supported versions](https://img.shields.io/pypi/pyversions/decaylanguage.svg)](https://pypi.python.org/pypi/decaylanguage)
-[![Commits since latest release](https://img.shields.io/github/commits-since/henryiii/decaylanguage/v0.1.0.svg)](https://github.com/henryiii/decaylanguage/compare/v0.1.0...master)
+[![Commits since latest release](https://img.shields.io/github/commits-since/scikit-hep/decaylanguage/v0.1.0.svg)](https://github.com/scikit-hep/decaylanguage/compare/v0.1.0...master)
 
 A language to describe particle decays, and tools to work with them.
 

diff --git a/README.rst b/README.rst
diff --git a/ci/appveyor-download.py b/ci/appveyor-download.py
@@ -95,7 +95,7 @@ def unpack_zipfile(filename):
 parser = argparse.ArgumentParser(description='Download artifacts from AppVeyor.')
 parser.add_argument('--id',
                     metavar='PROJECT_ID',
-                    default='henryiii/decaylanguage',
+                    default='scikit-hep/decaylanguage',
                     help='Project ID in AppVeyor.')
 parser.add_argument('build',
                     nargs='?',

diff --git a/docs/conf.py b/docs/conf.py
@@ -31,8 +31,8 @@
 pygments_style = 'trac'
 templates_path = ['.']
 extlinks = {
-    'issue': ('https://github.com/henryiii/decaylanguage/issues/%s', '#'),
-    'pr': ('https://github.com/henryiii/decaylanguage/pull/%s', 'PR #'),
+    'issue': ('https://github.com/scikit-hep/decaylanguage/issues/%s', '#'),
+    'pr': ('https://github.com/scikit-hep/decaylanguage/pull/%s', 'PR #'),
 }
 # on_rtd is whether we are on readthedocs.org
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -2,12 +2,12 @@
 Installation
 ============
 
-At the command line (not active until the first release)::
+At the command line::
 
     pip install decaylanguage
 
 Or::
 
-    pip install https://github.com/henryiii/decaylanguage.git
+    pip install https://github.com/scikit-hep/decaylanguage.git
 
 
diff --git a/setup.py b/setup.py
@@ -24,13 +24,10 @@ def read(*names, **kwargs):
     version='0.1.0',
     license='BSD 3-Clause License',
     description='A language to describe particle decays, and tools to work with them.',
-    long_description='%s\n%s' % (
-        re.compile('^.. start-badges.*^.. end-badges', re.M | re.S).sub('', read('README.rst')),
-        re.sub(':[a-z]+:`~?(.*?)`', r'``\1``', read('CHANGELOG.rst'))
-    ),
+    long_description=read('README.md'),
     author='Henry Fredrick Schreiner III',
     author_email='henry.schreiner@cern.ch',
-    url='https://github.com/henryiii/decaylanguage',
+    url='https://github.com/scikit-hep/decaylanguage',
     packages=find_packages(),
     include_package_data=True,
     zip_safe=True,

diff --git a/tox.ini b/tox.ini
@@ -57,7 +57,7 @@ deps =
     isort
 skip_install = true
 commands =
-    python setup.py check --strict --metadata --restructuredtext
+    python setup.py check --strict --metadata --markdown
     check-manifest {toxinidir}
     flake8 decaylanguage tests setup.py
     isort --verbose --check-only --diff --recursive decaylanguage tests setup.py