Skip to content

Commit

Permalink
Forgot to update __init__ for onshape_parser (#288)
Browse files Browse the repository at this point in the history
* Forgot to update __init__ for onshape_parser

* Fixing makedirs for onshape_parser

* Added PR and Test Coverage templates

* Bumping version

* Moving version down to 0.2.9 so I can re-release
  • Loading branch information
fletchapin authored Jan 15, 2021
1 parent 8d03e6b commit 097a00a
Show file tree
Hide file tree
Showing 6 changed files with 120 additions and 89 deletions.
21 changes: 21 additions & 0 deletions .github/ISSUE_TEMPLATE/test_coverage.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---

name: Test Coverage
about: A test is missing
title: "<Summarize the missing test coverage>"
labels: "testing, medium"

---

- [ ] I have reviewed the test coverage on [Codecov](https://codecov.io/gh/AguaClara/aguaclara)

---

## Describe the Missing Coverage
*What code isn't currently tested but definitely should be? Is a new `test_<>.py` file needed or can these tests be added to an existing one?*

## Expected Behavior
*A clear and concise description of what you expected to happen (or code).*

## Recommended Fix
*What is the most straightforward way to fully and appropriately test the feature.*
8 changes: 8 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
**Pull request recommendations:**
- [ ] Name your pull request _your-development-type/short-description_. Ex: _feature/validate_floc_
- [ ] Link to any relevant issue in the PR description. Ex: _Resolves [gh-12], adds flocculator validation_
- [ ] Provide context of changes.
- [ ] Provide relevant tests for your feature or bug fix.
- [ ] Provide or update documentation for any feature added by your pull request.

Thanks for contributing!
55 changes: 28 additions & 27 deletions aguaclara/__init__.py
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
from aguaclara.core.constants import *
from aguaclara.core.drills import *
from aguaclara.core.head_loss import *
from aguaclara.core.materials import *
from aguaclara.core.physchem import *
from aguaclara.core.pipes import *
from aguaclara.core.units import *
from aguaclara.core.utility import *

from aguaclara.design.cdc import CDC
from aguaclara.design.component import Component
from aguaclara.design.ent_floc import EntTankFloc
from aguaclara.design.ent import EntranceTank
from aguaclara.design.filter import Filter
from aguaclara.design.floc import Flocculator
import aguaclara.design.human_access as ha
from aguaclara.design.lfom import LFOM
from aguaclara.design.plant import Plant
from aguaclara.design.sed_chan import SedimentationChannel
from aguaclara.design.sed_tank import SedimentationTank
from aguaclara.design.sed import Sedimentor

from aguaclara.research.environmental_processes_analysis import *
from aguaclara.research.floc_model import *
from aguaclara.research.procoda_parser import *
from aguaclara.research.peristaltic_pump import *
from aguaclara.research.stock_qc import *
from aguaclara.core.constants import *
from aguaclara.core.drills import *
from aguaclara.core.head_loss import *
from aguaclara.core.materials import *
from aguaclara.core.physchem import *
from aguaclara.core.pipes import *
from aguaclara.core.units import *
from aguaclara.core.utility import *
from aguaclara.core.onshape_parser import *

from aguaclara.design.cdc import CDC
from aguaclara.design.component import Component
from aguaclara.design.ent_floc import EntTankFloc
from aguaclara.design.ent import EntranceTank
from aguaclara.design.filter import Filter
from aguaclara.design.floc import Flocculator
import aguaclara.design.human_access as ha
from aguaclara.design.lfom import LFOM
from aguaclara.design.plant import Plant
from aguaclara.design.sed_chan import SedimentationChannel
from aguaclara.design.sed_tank import SedimentationTank
from aguaclara.design.sed import Sedimentor

from aguaclara.research.environmental_processes_analysis import *
from aguaclara.research.floc_model import *
from aguaclara.research.procoda_parser import *
from aguaclara.research.peristaltic_pump import *
from aguaclara.research.stock_qc import *
2 changes: 1 addition & 1 deletion aguaclara/core/onshape_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def copy_to_docs(file_path, new_name=None, base="doc_files"):
try:
copyfile(os.path.join(basepath, file_path), new_path)
except IOError as io_err:
os.makedirs(os.path.dirname(file_path))
os.makedirs(os.path.dirname(new_path))
copyfile(os.path.join(basepath, file_path), new_path)

def parse_variables_from_list(unparsed, for_docs=True):
Expand Down
121 changes: 61 additions & 60 deletions aguaclara/play.py
Original file line number Diff line number Diff line change
@@ -1,60 +1,61 @@
"""``aguaclara`` package playground setup
Provide easy setup for using the ``aguaclara`` package and all of its modules,
classes, and functions.
Note: this module should not be used for development. Instead, individually
import only necessary modules.
Example:
>>> from aguaclara.play import *
"""
import math
import numpy as np
import pandas as pd
import matplotlib
import matplotlib.style
import matplotlib.pyplot as plt

import aguaclara.core.constants as con
from aguaclara.core import drills
import aguaclara.core.head_loss as k
import aguaclara.core.materials as mat
from aguaclara.core import physchem as pc
import aguaclara.core.pipes as pipe
from aguaclara.core.units import u
import aguaclara.core.utility as ut

from aguaclara.design.cdc import CDC
from aguaclara.design.component import Component
from aguaclara.design.ent_floc import EntTankFloc
from aguaclara.design.ent import EntranceTank
from aguaclara.design.filter import Filter
from aguaclara.design.floc import Flocculator
import aguaclara.design.human_access as ha
from aguaclara.design.lfom import LFOM
from aguaclara.design.plant import Plant
from aguaclara.design.sed_chan import SedimentationChannel
from aguaclara.design.sed_tank import SedimentationTank
from aguaclara.design.sed import Sedimentor

import aguaclara.research.environmental_processes_analysis as epa
import aguaclara.research.floc_model as fm
import aguaclara.research.procoda_parser as procoda_parser
import aguaclara.research.peristaltic_pump as peristaltic_pump
import aguaclara.research.stock_qc as stock_qc

import aguaclara as ac

def set_sig_figs(n=4):
"""Set the number of significant figures used to print Pint, Pandas, and
NumPy quantities.
Args:
n (int): Number of significant figures to display.
"""
u.default_format = '.' + str(n) + 'g'
pd.options.display.float_format = ('{:,.' + str(n) + '}').format

set_sig_figs()
matplotlib.style.use('ggplot')
"""``aguaclara`` package playground setup
Provide easy setup for using the ``aguaclara`` package and all of its modules,
classes, and functions.
Note: this module should not be used for development. Instead, individually
import only necessary modules.
Example:
>>> from aguaclara.play import *
"""
import math
import numpy as np
import pandas as pd
import matplotlib
import matplotlib.style
import matplotlib.pyplot as plt

import aguaclara.core.constants as con
from aguaclara.core import drills
import aguaclara.core.head_loss as k
import aguaclara.core.materials as mat
from aguaclara.core import physchem as pc
import aguaclara.core.pipes as pipe
from aguaclara.core.units import u
import aguaclara.core.utility as ut
import aguaclara.core.onshape_parser as par

from aguaclara.design.cdc import CDC
from aguaclara.design.component import Component
from aguaclara.design.ent_floc import EntTankFloc
from aguaclara.design.ent import EntranceTank
from aguaclara.design.filter import Filter
from aguaclara.design.floc import Flocculator
import aguaclara.design.human_access as ha
from aguaclara.design.lfom import LFOM
from aguaclara.design.plant import Plant
from aguaclara.design.sed_chan import SedimentationChannel
from aguaclara.design.sed_tank import SedimentationTank
from aguaclara.design.sed import Sedimentor

import aguaclara.research.environmental_processes_analysis as epa
import aguaclara.research.floc_model as fm
import aguaclara.research.procoda_parser as procoda_parser
import aguaclara.research.peristaltic_pump as peristaltic_pump
import aguaclara.research.stock_qc as stock_qc

import aguaclara as ac

def set_sig_figs(n=4):
"""Set the number of significant figures used to print Pint, Pandas, and
NumPy quantities.
Args:
n (int): Number of significant figures to display.
"""
u.default_format = '.' + str(n) + 'g'
pd.options.display.float_format = ('{:,.' + str(n) + '}').format

set_sig_figs()
matplotlib.style.use('ggplot')
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name = 'aguaclara',
version = '0.2.8',
version = '0.2.9',
description = (
'An open-source Python package for designing and performing research '
'on AguaClara water treatment plants.'
Expand Down

0 comments on commit 097a00a

Please sign in to comment.