diff --git a/MANIFEST b/MANIFEST index 20b899ec..ea43bbc4 100644 --- a/MANIFEST +++ b/MANIFEST @@ -15,6 +15,8 @@ gpkit/constraints/tight.py gpkit/interactive/__init__.py gpkit/interactive/plot_sweep.py gpkit/interactive/plotting.py +gpkit/interactive/references.py +gpkit/interactive/referencesplot.html gpkit/interactive/sankey.py gpkit/interactive/widgets.py gpkit/nomials/__init__.py @@ -51,7 +53,6 @@ gpkit/tools/docstring.py gpkit/tools/tools.py gpkit/units.py gpkit/__init__.py -gpkit/_cvxopt.py gpkit/build.py gpkit/exceptions.py gpkit/globals.py @@ -62,3 +63,4 @@ gpkit/small_scripts.py gpkit/solution_array.py gpkit/varkey.py setup.py +README.md diff --git a/gpkit/__init__.py b/gpkit/__init__.py index 7bc9a104..01fb36f4 100644 --- a/gpkit/__init__.py +++ b/gpkit/__init__.py @@ -1,6 +1,6 @@ "GP and SP modeling package" #pylint:disable=wrong-import-position -__version__ = "1.0.0pre" +__version__ = "1.0.0" GPCOLORS = ["#59ade4", "#FA3333"] GPBLU, GPRED = GPCOLORS diff --git a/gpkit/constraints/prog_factories.py b/gpkit/constraints/prog_factories.py index e743c2c7..a7f1d54d 100644 --- a/gpkit/constraints/prog_factories.py +++ b/gpkit/constraints/prog_factories.py @@ -2,7 +2,7 @@ from time import time import warnings as pywarnings import numpy as np -from ad import adnumber +from adce import adnumber from ..nomials import parse_subs from ..solution_array import SolutionArray from ..keydict import KeyDict diff --git a/gpkit/tests/t_sub.py b/gpkit/tests/t_sub.py index ea16490c..8545a00a 100644 --- a/gpkit/tests/t_sub.py +++ b/gpkit/tests/t_sub.py @@ -3,7 +3,7 @@ import unittest import numpy as np import numpy.testing as npt -from ad import adnumber, ADV +from adce import adnumber, ADV import gpkit from gpkit import SignomialsEnabled, NamedVariables from gpkit import Variable, VectorVariable, Model, Signomial diff --git a/setup.py b/setup.py index 9087ca20..bb0c3268 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,6 @@ with open(os.path.join(THIS_DIR, "README.md"), encoding="utf-8") as f: LONG_DESCRIPTION = f.read() - setup( name="gpkit", description="Package for defining and manipulating geometric " @@ -47,8 +46,9 @@ url="https://www.github.com/convexengineering/gpkit", python_requires=">=3.5.2", install_requires=["numpy >= 1.16.4", "pint >= 0.8.1", "plotly", - "scipy", "ad >= 1.3.2", "cvxopt >= 1.1.8"], - version="1.0.0", + "scipy", "adce", "cvxopt >= 1.1.8", + "matplotlib"], + version="1.0.0.3", packages=["gpkit", "gpkit.tools", "gpkit.interactive", "gpkit.constraints", "gpkit.nomials", "gpkit.tests", "gpkit.solvers"], package_data={"gpkit": ["env/settings"]},