Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mac osx support #96

Merged
merged 38 commits into from
May 28, 2017
Merged

Mac osx support #96

merged 38 commits into from
May 28, 2017

Conversation

abhiramm7
Copy link
Collaborator

  1. Updated tests for to look for .so and .dll based on platform
  2. Added support for macos
  3. Updated Readme.rst

@bemcdonnell
Copy link
Member

Addresses #95 #96

@bemcdonnell bemcdonnell added this to the v0.3.5 milestone May 27, 2017
Copy link
Member

@bemcdonnell bemcdonnell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bemcdonnell bemcdonnell requested a review from goanpeca May 27, 2017 18:59
@bemcdonnell
Copy link
Member

@goanpeca, Can you help with TravisCI for these changes?

@bemcdonnell
Copy link
Member

@abhiramm7, is there a smaller open-storm logo we can reference?

@bemcdonnell
Copy link
Member

@abhiramm7, I am going to turn travis on for pyswmm. Please update the .travis.yml file to the following:

language: python
python:
  - "2.7"
  - "3.4"
  - "3.5"
  - "3.6"
# command to install dependencies
install: "pip install -r requirements.txt"
# command to run tests
script: pytest

Copy link
Member

@bemcdonnell bemcdonnell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm still working on travis-ci, too. Need to get ciocheck running to pass the code quality checks

setup.py Outdated
package_data={'': ['lib/windows/swmm5.dll', 'LICENSE.txt', 'AUTHORS']},
include_package_data=True,
license="BSD2 License",
keywords="swmm5, swmm, hydraulics, hydrology, modeling, collection system",
classifiers=[
"Topic :: Scientific/Engineering",
"Topic :: Documentation :: Sphinx",
"Operating System :: Microsoft :: Windows",
"Operating System :: Microsoft :: Windows, Apple :: macOS",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setup.py Outdated
@@ -54,14 +54,16 @@ def get_description():
author_email='[email protected]',
install_requires=REQUIREMENTS,
packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
package_data={'': ['lib/windows/swmm5.dll', 'lib/macos/swmm5.so' ,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe Github is not showing this diff correct, but is package_data being overwritten?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@abhiramm7, it looks like package_data is being overwritten. add it into the list

pyswmm/swmm5.py Outdated
@@ -501,8 +504,8 @@ def getSimUnit(self, unittype):
>>> swmm_model.swmm_close()
"""
value = ctypes.c_int()
errcode = self.SWMMlibobj.swmm_getSimulationUnit(unittype,
ctypes.byref(value))
errcode = self.SWMMlibobj.swmm_getSimulationUnit(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would "un" line break these and get ciocheck running. These should all be solved with that

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do, i'll get it running

@bemcdonnell
Copy link
Member

Travis file, not appveyor

@abhiramm7
Copy link
Collaborator Author

My bad !

@bemcdonnell
Copy link
Member

One we get this working, we'll squash all these bad commits.

@bemcdonnell
Copy link
Member

@abhiramm7 you can also wait until Gonzalo is available. He's got lots of experience with Travis

@abhiramm7
Copy link
Collaborator Author

I think i found the error with travis, the dependencies were not loaded. I'll give it an other try. @bemcdonnell

@bemcdonnell bemcdonnell merged commit 853dd01 into pyswmm:master May 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants