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

Make HexGrid private and create HexSingleGrid and HexMultiGrid #1581

Merged
merged 11 commits into from
May 9, 2023

Conversation

Tortar
Copy link
Contributor

@Tortar Tortar commented Jan 8, 2023

Made HexGrid private and created two new grid classes as discussed in the dev meeting. This is a breaking change to defer until 2.0.

@codecov
Copy link

codecov bot commented Jan 8, 2023

Codecov Report

Patch coverage: 71.42% and project coverage change: -0.07 ⚠️

Comparison is base (3b67995) 81.69% compared to head (1a8669c) 81.62%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1581      +/-   ##
==========================================
- Coverage   81.69%   81.62%   -0.07%     
==========================================
  Files          18       18              
  Lines        1393     1399       +6     
  Branches      238      271      +33     
==========================================
+ Hits         1138     1142       +4     
- Misses        209      211       +2     
  Partials       46       46              
Impacted Files Coverage Δ
mesa/space.py 91.00% <71.42%> (-0.38%) ⬇️

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@jeremander
Copy link
Contributor

To ease backward compatibility, can you keep HexGrid and deprecate it? For example, have HexGrid subclass HexSingleGrid and issue a DeprecationWarning upon construction?

@Tortar
Copy link
Contributor Author

Tortar commented Apr 24, 2023

This seems like a good idea 👍

@Tortar
Copy link
Contributor Author

Tortar commented Apr 24, 2023

But I have not much time to work on this now, also it should be done with care I think since if we issue it in __init__ we will overwrite the __init__ method in the superclass so this should be managed somehow

@Tortar
Copy link
Contributor Author

Tortar commented Apr 24, 2023

Actually did it

@rht
Copy link
Contributor

rht commented Apr 25, 2023

Needs to resolve merge conflict.

@Tortar
Copy link
Contributor Author

Tortar commented Apr 25, 2023

I don't see any merge conflict @rht , however I resolved one sometime ago

@rht
Copy link
Contributor

rht commented May 9, 2023

I have rebased the branch. RTD build has a failure that is unrelated to this PR

ImportError: urllib3 v2.0 only supports OpenSSL 1.1.1+, currently the 'ssl' module is compiled with OpenSSL 1.0.2n  7 Dec 2017. See: https://github.com/urllib3/urllib3/issues/2168

@EwoutH any idea about the situation?

@rht rht merged commit 0e9f818 into projectmesa:main May 9, 2023
@rht
Copy link
Contributor

rht commented May 9, 2023

Merged, thank you!

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.

4 participants