Skip to content

Add conda-forge release chceklist to GitHub Issue template #98

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

Closed
wants to merge 59 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
be6c14a
pre-commit run with no manual change
stevenhua0320 Aug 11, 2024
58a94de
Merge pull request #70 from stevenhua0320/c1
sbillinge Aug 11, 2024
3dfe3b4
ValueError to TypeError for two test functions
bobleesj Aug 19, 2024
0540413
Run black . without any manual modification
bobleesj Aug 19, 2024
68d57e4
Merge pull request #73 from bobleesj/cookie-black
sbillinge Aug 19, 2024
6be7651
Merge pull request #71 from bobleesj/cookie-pass-test
sbillinge Aug 19, 2024
b64fe12
Remove the usage of l in adding literal
bobleesj Aug 20, 2024
cc2bd12
Change l to error message
bobleesj Aug 20, 2024
e5adc96
Rename lambda l to calculate_pr
bobleesj Aug 20, 2024
92c5493
Rename l to lattice
bobleesj Aug 20, 2024
5d7a65d
Rename l to l_parameter
bobleesj Aug 20, 2024
ad545e4
Rename l to lattice
bobleesj Aug 20, 2024
95483ef
Fix multiple # into a single #
bobleesj Aug 20, 2024
c61ba23
Import modules at the top
bobleesj Aug 20, 2024
baaf54e
Move doc module at the top
bobleesj Aug 20, 2024
bf1fcaf
Move module at the top, fix format for if-stmt
bobleesj Aug 20, 2024
a0e5fa5
Merge pull request #74 from bobleesj/cookie-flake8
sbillinge Aug 20, 2024
e373508
Merge branch 'cookie' into cookie-flake8-E266
sbillinge Aug 20, 2024
12507e8
Merge pull request #75 from bobleesj/cookie-flake8-E266
sbillinge Aug 20, 2024
0927c7a
Merge pull request #76 from bobleesj/cookie-flake8-E402
sbillinge Aug 20, 2024
a4f99b4
Fix unambiguous label name from I to intensity
bobleesj Aug 21, 2024
82f18b8
Use 'not in' instead of not xxx in
bobleesj Aug 21, 2024
e19a955
Do not use not in and use black fix cond lines
bobleesj Aug 21, 2024
91835f7
Replace not xxx in to not in, make variables clear
bobleesj Aug 21, 2024
563de3f
Merge pull request #77 from bobleesj/cookie-flake8-rest
sbillinge Aug 21, 2024
b478b10
Move lambda directly into funcs
bobleesj Aug 21, 2024
02ce549
Use noqa for clear ladmbda in test builder
bobleesj Aug 21, 2024
a05b3f1
Replace erf to erfc by importing the func
bobleesj Aug 21, 2024
bf0244a
Merge pull request #79 from bobleesj/cookie-lambda-direct
sbillinge Aug 22, 2024
15d57bd
Merge pull request #81 from bobleesj/cookie-lambda-func2
sbillinge Aug 22, 2024
312c34d
Use nested func instead of lambda in builder.py
bobleesj Aug 24, 2024
4f724d7
Insert lambda into map in prcalcualtor.py
bobleesj Aug 24, 2024
e649789
Use noqa #731 for a test function in testcontribution.py
bobleesj Aug 24, 2024
7ea0fa9
Merge pull request #82 from bobleesj/flake8-lambda-3
sbillinge Aug 25, 2024
2ac6bfb
Add noqa: E731 with flake8
bobleesj Sep 10, 2024
f1162a6
Merge pull request #84 from bobleesj/cookie-lambda
sbillinge Sep 14, 2024
50ad60b
Add minimal pyproject
bobleesj Sep 26, 2024
876f895
Move tests and rename test files
bobleesj Sep 26, 2024
faed7be
Add github CI and change conda-recipe files to .txt
bobleesj Sep 26, 2024
d50dd9d
Add test.txt, run.txt
bobleesj Sep 26, 2024
52c4b80
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Sep 26, 2024
2fafe83
Add env.yml file
bobleesj Sep 26, 2024
5798f0c
Merge pull request #89 from bobleesj/cookie-py312
sbillinge Sep 30, 2024
d39431e
Add doc
bobleesj Sep 30, 2024
8af2e9b
Add src
bobleesj Sep 30, 2024
bc92906
Add license
bobleesj Sep 30, 2024
78d1048
Add tests, iosrt, flake8, codecov
bobleesj Sep 30, 2024
99265fe
Add requirements
bobleesj Sep 30, 2024
2183645
Auhors, changelog, code of conduct
bobleesj Sep 30, 2024
0c8e78b
Delete older files
bobleesj Sep 30, 2024
f64b601
Add coveragerc
bobleesj Sep 30, 2024
a9c853c
Add limited license
bobleesj Sep 30, 2024
7224746
Add diffpy.structure under run-ext
bobleesj Sep 30, 2024
89ddff4
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Sep 30, 2024
6fe1508
Change news name to cookie
bobleesj Sep 30, 2024
dca1ca7
merge
bobleesj Sep 30, 2024
f0debb9
Update citation and fix being developed at columbia
bobleesj Oct 1, 2024
2836264
Merge pull request #91 from bobleesj/cookie-recut
sbillinge Oct 1, 2024
061f4a9
Add conda-forge release chceklist to GitHub Issue template
bobleesj Nov 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Do not use not in and use black fix cond lines
  • Loading branch information
bobleesj committed Aug 21, 2024
commit e19a95553f458110b34292a77ec64d1af2c1cd58
10 changes: 6 additions & 4 deletions src/diffpy/srfit/equation/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,11 @@ def _getUndefinedArgs(self, eqstr):
# generated.
for tok in set(args):
# Move genuine varibles to the eqargs dictionary
if (tok in self.builders or # Check registered builders
tok in EquationFactory.symbols or # Check symbols
tok in EquationFactory.ignore): # Check ignored characters
if (
tok in self.builders # Check registered builders
or tok in EquationFactory.symbols # Check symbols
or tok in EquationFactory.ignore # Check ignored characters
):
args.remove(tok)

return args
Expand Down Expand Up @@ -665,7 +667,7 @@ def __wrapSrFitOperators():
inspect.isclass(cls)
and issubclass(cls, opmod.Operator)
and not inspect.isabstract(cls)
and not cls in excluded_types
and cls not in excluded_types
)
# create OperatorBuilder objects
for nm, opclass in inspect.getmembers(opmod, is_exported_type):
Expand Down