From bcd58f95712f5dd0f029272b647b31f75e58a90d Mon Sep 17 00:00:00 2001 From: "Diego M. Rodriguez" Date: Fri, 18 Jan 2019 18:22:36 +0100 Subject: [PATCH 1/2] Update packaging files preparing for release --- CHANGELOG.rst | 5 +++++ MANIFEST.in | 1 + qiskit/providers/ibmq/VERSION.txt | 2 +- requirements.txt | 1 - setup.py | 10 ++++++---- 5 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 MANIFEST.in diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6b0472cec..f8ce9fdaf 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -20,6 +20,10 @@ The format is based on `Keep a Changelog`_. ^^^^^^^^^^^^^ +`0.1rc1`_ +^^^^^^^^^ + + Added """"" @@ -37,5 +41,6 @@ Changed .. _UNRELEASED: https://github.com/Qiskit/qiskit-ibmq-provider/compare/104d524...HEAD +.. _0.1rc1: https://github.com/Qiskit/qiskit-ibmq-provider/compare/104d524...0.1rc1 .. _Keep a Changelog: http://keepachangelog.com/en/1.0.0/ diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 000000000..4b6434d8c --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +include qiskit/providers/ibmq/VERSION.txt diff --git a/qiskit/providers/ibmq/VERSION.txt b/qiskit/providers/ibmq/VERSION.txt index eb49d7c7f..fb69c76be 100644 --- a/qiskit/providers/ibmq/VERSION.txt +++ b/qiskit/providers/ibmq/VERSION.txt @@ -1 +1 @@ -0.7 +0.1rc1 diff --git a/requirements.txt b/requirements.txt index b5eaca6dc..cc62fa98a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -qiskit-terra>=0.7,<0.8 marshmallow>=2.17.0,<3 requests>=2.19 requests-ntlm>=1.1.0 diff --git a/setup.py b/setup.py index 1df628583..42767be1c 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ from setuptools import setup requirements = [ - "qiskit-terra>=0.7,<0.8", + #"qiskit-terra>=0.8", # TODO: disabled for developers convenience "marshmallow>=2.17.0,<3", "requests>=2.19", "requests-ntlm>=1.1.0", @@ -18,7 +18,7 @@ # Handle version. VERSION_PATH = os.path.join(os.path.dirname(__file__), - "qiskit", "providers", "aer", "VERSION.txt") + "qiskit", "providers", "ibmq", "VERSION.txt") with open(VERSION_PATH, "r") as version_file: VERSION = version_file.read().strip() @@ -30,7 +30,7 @@ "access to real quantum devices and simulators.", url="https://github.com/Qiskit/qiskit-ibmq-provider", author="Qiskit Development Team", - author_email="qiskit@us.ibm.com", + author_email="qiskit@qiskit.org", license="Apache 2.0", classifiers=[ "Environment :: Console", @@ -46,7 +46,9 @@ "Topic :: Scientific/Engineering", ], keywords="qiskit sdk quantum api ibmq", - packages=['qiskit.providers.ibmq'], + packages=['qiskit.providers.ibmq', + 'qiskit.providers.ibmq.api', + 'qiskit.providers.ibmq.credentials'], install_requires=requirements, include_package_data=True, python_requires=">=3.5" From 36f2aad4b3d373d0c693fbcc251796fa09ea9a65 Mon Sep 17 00:00:00 2001 From: "Diego M. Rodriguez" Date: Mon, 21 Jan 2019 10:25:26 +0100 Subject: [PATCH 2/2] Update long description, include license --- MANIFEST.in | 1 + setup.py | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 4b6434d8c..6fba00dce 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,2 @@ +include LICENSE.txt README.md include qiskit/providers/ibmq/VERSION.txt diff --git a/setup.py b/setup.py index 739d8f44e..bd1beaec0 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,6 @@ requirements = [ #"qiskit-terra>=0.8", # TODO: disabled for developers convenience - "requests>=2.19", "requests-ntlm>=1.1.0", ] @@ -22,12 +21,19 @@ with open(VERSION_PATH, "r") as version_file: VERSION = version_file.read().strip() +# Read long description from README. +README_PATH = os.path.join(os.path.abspath(os.path.dirname(__file__)), + 'README.md') +with open(README_PATH) as readme_file: + README = readme_file.read() + + setup( name="qiskit-ibmq-provider", version=VERSION, - description="Qiskit provider for IBMQ network", - long_description="Qiskit provider for accessing the IBMQ network, allowing " - "access to real quantum devices and simulators.", + description="Qiskit provider for IBM Q quantum devices and simulators", + long_description=README, + long_description_content_type='text/markdown', url="https://github.com/Qiskit/qiskit-ibmq-provider", author="Qiskit Development Team", author_email="qiskit@qiskit.org",