Skip to content

Commit

Permalink
Merge pull request #6 from Pyomo/v1.0.2
Browse files Browse the repository at this point in the history
Updates to tag 1.0.2
  • Loading branch information
whart222 committed Jan 24, 2019
2 parents 254a84e + 52e2fe2 commit 478ca44
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ matrix:
env: CATEGORY="nightly" EXTRAS="yes"
- python: '3.6'
env: CATEGORY="nightly" EXTRAS="yes"
#- python: '3.7'
# env: CATEGORY="nightly" EXTRAS="yes"
# dist: xenial
# sudo: yes
install:
- sudo apt-get update --quiet
- sudo apt-get install gfortran
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
pyomocontrib_simplemodel CHANGELOG
==================================

-------------------------------------------------------------------------------
1.0.2
-------------------------------------------------------------------------------

- Documentation updates.
- Updating testing infrastructure to mimic pyomo
- Tracking changes in Pyomo 5.6

-------------------------------------------------------------------------------
1.0.1
-------------------------------------------------------------------------------
Expand Down
5 changes: 5 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ environment:
PYTHON: "C:\\Miniconda36-x64"
CATEGORY: "nightly"

- PYTHON_VERSION: 3.7
#PYTHON: "C:\\Python37"
PYTHON: "C:\\Miniconda37-x64"
CATEGORY: "nightly"

install:
# We need wheel installed to build wheels
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PYTHON%\\Library\\bin;%PATH%"
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()

requires = [
'Pyomo>=5.0',
'Pyomo>=5.6',
]

from setuptools import setup
packages = _find_packages('pyomocontrib_simplemodel')

setup(name='pyomocontrib_simplemodel',
version='1.0.1',
version='1.0.2',
maintainer='William E. Hart',
maintainer_email='[email protected]',
url='https://pyomo.org',
Expand Down

0 comments on commit 478ca44

Please sign in to comment.