Merge 501c02b into 24970dd

.gitignore

@@ -1,7 +1,7 @@
 __pycache__/
 *.py[cod]
-build/
-dist/
+/docs/_build/
+/dist/
 *.egg-info/
 .coverage
 .coverage.*

CHANGELOG.md

@@ -1,32 +1,43 @@
 # Change Log
 
-## [v1.0.5](https://github.com/mcs07/ChemSpiPy/releases/tag/v1.0.5) (2017-03-29)
-[Full Changelog](https://github.com/mcs07/ChemSpiPy/compare/v1.0.4...v1.0.5)
+## [v2.0.0](https://github.com/mcs07/ChemSpiPy/tree/v2.0.0) (2018-09-09)
+[Full Changelog](https://github.com/mcs07/ChemSpiPy/compare/v1.0.5...v2.0.0)
+
+**Implemented enhancements:**
+
+- Switch to new RSC REST API [\#12](https://github.com/mcs07/ChemSpiPy/pull/12) ([mcs07](https://github.com/mcs07))
 
 **Closed issues:**
 
-- Add support for https [\#5](https://github.com/mcs07/ChemSpiPy/issues/5)
+- Make conda-forge recipe [\#13](https://github.com/mcs07/ChemSpiPy/issues/13)
+- return \# of data sources in search results [\#10](https://github.com/mcs07/ChemSpiPy/issues/10)
 
-**Merged pull requests:**
+## [v1.0.5](https://github.com/mcs07/ChemSpiPy/tree/v1.0.5) (2017-03-29)
+[Full Changelog](https://github.com/mcs07/ChemSpiPy/compare/v1.0.4...v1.0.5)
+
+**Implemented enhancements:**
 
 - Switch to pytest [\#7](https://github.com/mcs07/ChemSpiPy/pull/7) ([mcs07](https://github.com/mcs07))
+
+**Fixed bugs:**
+
+- Add support for https [\#5](https://github.com/mcs07/ChemSpiPy/issues/5)
 - Use https by default - fixes \#5 [\#6](https://github.com/mcs07/ChemSpiPy/pull/6) ([mcs07](https://github.com/mcs07))
+
+**Merged pull requests:**
+
 - Improve handling of invalid tokens [\#4](https://github.com/mcs07/ChemSpiPy/pull/4) ([mcs07](https://github.com/mcs07))
 
-## [v1.0.4](https://github.com/mcs07/ChemSpiPy/releases/tag/v1.0.4) (2015-06-13)
+## [v1.0.4](https://github.com/mcs07/ChemSpiPy/tree/v1.0.4) (2015-06-13)
 [Full Changelog](https://github.com/mcs07/ChemSpiPy/compare/v1.0.3...v1.0.4)
 
-## [v1.0.3](https://github.com/mcs07/ChemSpiPy/releases/tag/v1.0.3) (2015-03-05)
+## [v1.0.3](https://github.com/mcs07/ChemSpiPy/tree/v1.0.3) (2015-03-05)
 [Full Changelog](https://github.com/mcs07/ChemSpiPy/compare/v1.0.2...v1.0.3)
 
-## [v1.0.2](https://github.com/mcs07/ChemSpiPy/releases/tag/v1.0.2) (2015-03-04)
+## [v1.0.2](https://github.com/mcs07/ChemSpiPy/tree/v1.0.2) (2015-03-04)
 [Full Changelog](https://github.com/mcs07/ChemSpiPy/compare/v1.0.1...v1.0.2)
 
-## [v1.0.1](https://github.com/mcs07/ChemSpiPy/releases/tag/v1.0.1) (2014-09-15)
-**Merged pull requests:**
+## [v1.0.1](https://github.com/mcs07/ChemSpiPy/tree/v1.0.1) (2014-09-15)
+**Implemented enhancements:**
 
 - Fix for UTF-8 encoding error \(and some other tweaks\)... [\#2](https://github.com/mcs07/ChemSpiPy/pull/2) ([nickfyson](https://github.com/nickfyson))
-
-
-
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

CONTRIBUTING.rst

@@ -22,11 +22,12 @@ Quick guide to contributing
 1. `Fork the ChemSpiPy repository on GitHub`_, then clone your fork to your local machine::
 
     git clone https://github.com/<username>/ChemSpiPy.git
+    cd ChemSpiPy
 
-2. Install the development requirements::
+2. Install the development requirements into a `conda environment`_::
 
-    cd chemspipy
-    pip install -r requirements/dev.txt
+    conda env create -n chemspipy -f environment.yml
+    source activate chemspipy
 
 3. Create a new branch for your changes::
 
@@ -36,8 +37,6 @@ Quick guide to contributing
 
     pytest
 
-   The final line of the output should be ``OK``.
-
 5. Commit your changes and push to your fork on GitHub::
 
     git add .
@@ -53,15 +52,14 @@ Tips
 - Include docstrings as described in `PEP257`_.
 - Try and include tests that cover your changes.
 - Try to write `good commit messages`_.
-- Consider `squashing your commits`_ with rebase.
 - Read the GitHub help page on `Using pull requests`_.
 
 .. _`Issue Tracker`: https://github.com/mcs07/ChemSpiPy/issues
 .. _`source code`: https://github.com/mcs07/ChemSpiPy
 .. _`Fork the ChemSpiPy repository on GitHub`: https://github.com/mcs07/ChemSpiPy/fork
+.. _`conda environment`: https://conda.io/docs/
 .. _`Submit a pull request`: https://github.com/mcs07/ChemSpiPy/compare/
-.. _`squashing your commits`: http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
 .. _`PEP8`: https://www.python.org/dev/peps/pep-0008
 .. _`PEP257`: https://www.python.org/dev/peps/pep-0257
-.. _`good commit messages`: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+.. _`good commit messages`: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 .. _`Using pull requests`: https://help.github.com/articles/using-pull-requests

MANIFEST.in

@@ -1,6 +1,7 @@
 include *.rst
+include CHANGELOG.md
+include environment.yml
 include LICENSE
 recursive-include tests *.py
 recursive-include docs *
-recursive-include requirements *.txt
-prune docs/build
+prune docs/_build

README.rst

@@ -1,16 +1,16 @@
 ChemSpiPy
 =========
 
-.. image:: http://img.shields.io/pypi/v/ChemSpiPy.svg?style=flat
+.. image:: https://img.shields.io/pypi/v/ChemSpiPy.svg?style=flat
     :target: https://pypi.python.org/pypi/ChemSpiPy
 
-.. image:: http://img.shields.io/pypi/l/ChemSpiPy.svg?style=flat
+.. image:: https://img.shields.io/pypi/l/ChemSpiPy.svg?style=flat
     :target: https://github.com/mcs07/ChemSpiPy/blob/master/LICENSE
 
-.. image:: http://img.shields.io/travis/mcs07/ChemSpiPy/master.svg?style=flat
+.. image:: https://img.shields.io/travis/mcs07/ChemSpiPy/master.svg?style=flat
     :target: https://travis-ci.org/mcs07/ChemSpiPy
 
-.. image:: http://img.shields.io/coveralls/mcs07/ChemSpiPy/master.svg?style=flat
+.. image:: https://img.shields.io/coveralls/mcs07/ChemSpiPy/master.svg?style=flat
     :target: https://coveralls.io/r/mcs07/ChemSpiPy?branch=master
 
 ChemSpiPy provides a way to interact with ChemSpider in Python. It allows chemical searches, chemical file downloads,
@@ -24,7 +24,12 @@ depiction and retrieval of chemical properties::
 Installation
 ------------
 
-Install ChemSpiPy using pip::
+Install ChemSpiPy using conda::
+
+    conda install -c conda-forge chemspipy
+
+
+or using pip::
 
     pip install chemspipy
 
@@ -33,7 +38,7 @@ Alternatively, try one of the other `installation options`_.
 Documentation
 -------------
 
-Full documentation is available at http://chemspipy.readthedocs.io.
+Full documentation is available at https://chemspipy.readthedocs.io/en/stable/.
 
 The `general documentation for the ChemSpider API`_ is also a useful resource.
 
@@ -50,9 +55,9 @@ ChemSpiPy is licensed under the `MIT license`_.
 
 This project was originally forked from `ChemSpiPy by Cameron Neylon`_, which has been released into the public domain.
 
-.. _`installation options`: http://chemspipy.readthedocs.io/en/latest/guide/install.html
+.. _`installation options`: https://chemspipy.readthedocs.io/en/stable/guide/install.html
 .. _`source code`: https://github.com/mcs07/ChemSpiPy
 .. _`Issue Tracker`: https://github.com/mcs07/ChemSpiPy/issues
 .. _`MIT license`: https://github.com/mcs07/ChemSpiPy/blob/master/LICENSE
 .. _`ChemSpiPy by Cameron Neylon`: https://github.com/cameronneylon/ChemSpiPy
-.. _`general documentation for the ChemSpider API`: http://www.chemspider.com/AboutServices.aspx
+.. _`general documentation for the ChemSpider API`: https://developer.rsc.org/compounds-v1/apis

chemspipy/__init__.py

@@ -19,6 +19,6 @@
 
 
 from .api import ChemSpider, MOL2D, MOL3D, BOTH, ASCENDING, DESCENDING, RECORD_ID, CSID, MASS_DEFECT, MOLECULAR_WEIGHT
-from .api import REFERENCE_COUNT, DATASOURCE_COUNT, PUBMED_COUNT, RSC_COUNT
+from .api import REFERENCE_COUNT, DATASOURCE_COUNT, PUBMED_COUNT, RSC_COUNT, FIELDS
 from .objects import Compound
 from .search import Results