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

Add metadata and license #8

Merged
merged 4 commits into from
Jul 4, 2019
Merged

Add metadata and license #8

merged 4 commits into from
Jul 4, 2019

Conversation

bryanwweber
Copy link
Contributor

Adds license_file metadata and additional metadata for the project

This ensures the LICENSE is distributed with source and binary
distributions of the package
Also ignore build folder for setuptools builds
@codecov-io
Copy link

codecov-io commented Apr 29, 2019

Codecov Report

Merging #8 into master will decrease coverage by 0.05%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##           master      #8      +/-   ##
=========================================
- Coverage   72.65%   72.6%   -0.06%     
=========================================
  Files           7       7              
  Lines         512     511       -1     
=========================================
- Hits          372     371       -1     
  Misses        140     140

It was imported but never used in __RandomWalk__.py
@TomTranter
Copy link
Collaborator

Hi @bryanwweber, thanks for this pull request. Why are you removing porespy dependency though? It is necessary for examples

@bryanwweber
Copy link
Contributor Author

Hi @TomTranter! Indeed, but the current state is a circular dependency between pytrax and PoreSpy (i.e., PoreSpy depends on having a pytrax package, and vice versa). I'm working with @ma-sadeghi to build conda packages for OpenPNM, PoreSpy and pytrax and to do that there can't be any circular dependencies. If PoreSpy is necessary to run the example, users will need to install that themselves, rather than requiring it in setup.py.

Removing it from the package dependencies caused the tests to fail.
@TomTranter
Copy link
Collaborator

I was planning to make notebooks for the examples anyway so I could maybe add an install line into those if the user hasn't got porespy

@bryanwweber
Copy link
Contributor Author

IMO it would be better to do something like:

try:
    import porespy as ps
except ImportError:
    print("PoreSpy must be installed for the examples. Use pip or conda to install it")
    raise

That way, people who don't have administrator permissions don't get a strange error from trying to install PoreSpy and the actual cause of the problem is identified. Also, some people will want to use pip, others conda, others build from source, etc.

@TomTranter
Copy link
Collaborator

@bryanwweber good suggestion. Is this good to be merged in now? I will create a separate branch to update examples afterwards

@bryanwweber
Copy link
Contributor Author

@TomTranter Yes, it's good from my end. BTW, thanks for considering this! I didn't include any explanation in the first comment, just kind of dropped it on your head. I had assumed that your group would know what I was doing, it seems that was my mistake! Sorry for the missing explanation 😄

@TomTranter
Copy link
Collaborator

@bryanwweber no worries, I'm not physically in Jeff's group anymore so everyone else probably knows what you're up to

@ma-sadeghi
Copy link
Member

Sorry @TomTranter and @bryanwweber, my bad. I forgot to let Tom know what we were up to.

@TomTranter, we want to include Cantera as an OpenPNM dependency for mixtures, but since Cantera is not pip-installable yet, @bryanwweber offered to help us develop conda packages for our libraries so we can safely list Cantera as a dependency.

@TomTranter TomTranter merged commit 1bcbc28 into PMEAL:master Jul 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants