Skip to content

Commit

Permalink
Update setup.py + black formatting (#70)
Browse files Browse the repository at this point in the history
* Update setup.py

* changed numpy to <1.24

* ran black

* Bump patch version

---------

Co-authored-by: sseraj <[email protected]>
  • Loading branch information
A-CGray and sseraj authored Feb 20, 2023
1 parent da06bdd commit 03b2207
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 11 deletions.
2 changes: 1 addition & 1 deletion pyhyp/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__version__ = "2.6.0"
__version__ = "2.6.1"

from .pyHyp import pyHyp, pyHypMulti
8 changes: 0 additions & 8 deletions pyhyp/pyHyp.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ class pyHypMulti(object):
"""

def __init__(self, comm=None, options=None, commonOptions=None, debug=False, skipList=[]):

"""
The inititalization method will setup, run, and write all the results.
Expand Down Expand Up @@ -166,11 +165,9 @@ def __init__(self, comm=None, options=None, commonOptions=None, debug=False, ski

# Loop over all elements in the options list
for optionName in optionsDict:

options = optionsDict[optionName]

if type(options) is str:

# Just set up relationships to combine it with the other grids
# later on
self.results["name"][index] = optionName
Expand Down Expand Up @@ -213,7 +210,6 @@ def __init__(self, comm=None, options=None, commonOptions=None, debug=False, ski
index = index + 1

elif type(options) is dict:

# Only the root processor will print
if myid == 0:
print("")
Expand Down Expand Up @@ -256,7 +252,6 @@ def writeLog(self):

# Only the root processor will print
if myid == 0:

print("")
print("")
print("")
Expand All @@ -270,7 +265,6 @@ def writeLog(self):
print("+----+-----------------------+-----------+-------------------+------------------+")

for index in range(self.numGrids):

# Crop filename
try:
filename = self.results["name"][index][:21]
Expand Down Expand Up @@ -341,7 +335,6 @@ def combineCGNS(self, combinedFile="combined.cgns", additionalGrids=[], skipList

# Run cgnsUtilities on the root processor
if self.comm.rank == 0:

# Add generated grids that we do not want to skip
selectedGrids = []
gridList = []
Expand Down Expand Up @@ -491,7 +484,6 @@ def __init__(self, comm=None, options=None, debug=False):
)
BCToSet = BCs[blkBC][edgeKey].lower()
if BCToSet.lower() not in BCMap.keys():

raise Error(
"Boundary condition specification unknown. Must be one of: "
"'splay', 'xSymm', 'ySymm', 'zSymm', "
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
),
package_data={"pyhyp": ["*.so"]},
install_requires=[
"numpy>=1.16",
"numpy>=1.16,<1.24",
"mpi4py>=3.0",
"mdolab-baseclasses>=1.3",
"cgnsutilities>=2.5",
Expand Down
1 change: 0 additions & 1 deletion tests/test_all_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@


class TestExamples(unittest.TestCase):

N_PROCS = 2

def setUp(self):
Expand Down

0 comments on commit 03b2207

Please sign in to comment.