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

Allow multiple font styles in var names #444

Merged
merged 3 commits into from
Jun 27, 2024

Conversation

rogersamso
Copy link
Contributor

Description

When parsing the sketch, multiple font styles may be used for variable names. Before this PR only a single style option was possible.

Related issues

Fixes #443

Type of change

  • Bug fix (non-breaking change which fixes an issue)

PR verification (to be filled by reviewers)

  • The code follows the PEP 8 style
  • The new code has been tested properly for all the possible cases
  • The overall coverage has not dropped and other features have not been broken.
  • If new features have been added, they have been properly documented
  • docs/whats_new.rst has been updated
  • PySD version has been updated

@rogersamso
Copy link
Contributor Author

I should have upgraded my environment before pushing any changes 😅. At some point we should look at the breaking changes from numpy 2.0

@enekomartinmartinez
Copy link
Collaborator

Hi @rogersamso

Thank you for taking care of this, I would try to filter the numpy warning before limiting the version, I am doing some tests locally and I will let you know.

@enekomartinmartinez
Copy link
Collaborator

enekomartinmartinez commented Jun 27, 2024

Filtering the warning here seems to work

pysd/tests/conftest.py

Lines 71 to 73 in d1263fb

"__array__ implementation doesn't accept a copy keyword, so passing "
"copy=False failed. __array__ must implement 'dtype' and 'copy' "
"keyword arguments.",

@rogersamso
Copy link
Contributor Author

Filtering the warning here seems to work

pysd/tests/conftest.py

Lines 71 to 73 in d1263fb

"__array__ implementation doesn't accept a copy keyword, so passing "
"copy=False failed. __array__ must implement 'dtype' and 'copy' "
"keyword arguments.",

Do I delete the last commit, then?

@enekomartinmartinez
Copy link
Collaborator

Filtering the warning here seems to work

pysd/tests/conftest.py

Lines 71 to 73 in d1263fb

"__array__ implementation doesn't accept a copy keyword, so passing "
"copy=False failed. __array__ must implement 'dtype' and 'copy' "
"keyword arguments.",

Do I delete the last commit, then?

Yes, you can delete the last two, no need to limit more the version of openpyxl

Also need to do a small change in the builder

dims_list = np.array([
list(coords) for coords in coords_list]).transpose().tolist()

@enekomartinmartinez
Copy link
Collaborator

Sorry there is something that still fails

@rogersamso
Copy link
Contributor Author

Sorry there is something that still fails

openpyxl 3.1.1 breaks things

@enekomartinmartinez
Copy link
Collaborator

Sorry there is something that still fails

openpyxl 3.1.1 breaks things

Okay!

@enekomartinmartinez
Copy link
Collaborator

It seems that it is working now. You can remove the last commit, and I will merge the fixes to the test in the master.

I will also make CI skip the coverage for Windows and Python 3.12, so it will run faster

@rogersamso
Copy link
Contributor Author

It seems that it is working now. You can remove the last commit, and I will merge the fixes to the test in the master.

I will also make CI skip the coverage for Windows and Python 3.12, so it will run faster

Done

@enekomartinmartinez enekomartinmartinez merged commit 10d5972 into SDXorg:master Jun 27, 2024
8 of 13 checks passed
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.

Error reading Vensim model (parsimonious.exceptions.IncompleteParseError)
2 participants