Skip to content

Commit

Permalink
Merge 8279673 into 6e83ec4
Browse files Browse the repository at this point in the history
  • Loading branch information
bqpd committed Oct 26, 2021
2 parents 6e83ec4 + 8279673 commit e962d4f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
4 changes: 3 additions & 1 deletion MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -62,3 +63,4 @@ gpkit/small_scripts.py
gpkit/solution_array.py
gpkit/varkey.py
setup.py
README.md
2 changes: 1 addition & 1 deletion gpkit/__init__.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion gpkit/constraints/prog_factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gpkit/tests/t_sub.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand All @@ -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"]},
Expand Down

0 comments on commit e962d4f

Please sign in to comment.