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.

Sign up for GitHub

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

Jump to bottom

merging into master from develop to make a new release #573

Merged
merged 245 commits into from
Apr 10, 2025
Merged

merging into master from develop to make a new release #573

merged 245 commits into from
Apr 10, 2025

Conversation

proccaserra
Copy link
Member

this is to address issues with isa-tab parser and many improvements

proccaserra and others added 30 commits September 21, 2022 17:57
@proccaserra
ld-refactor updating isa-jsonschemas, updating model classes to add t…
6f52763 
…o_ld method
@proccaserra
Merge branch 'develop' of github.com:ISA-tools/isa-api into develop
db01962
@proccaserra
adding tests to test-create
ff576f3
@proccaserra
upgrading from develop
1b1663d
@proccaserra
bring develop up to test
cacdf87
@proccaserra
Merge branch 'develop' of github.com:ISA-tools/isa-api into develop
d6cc5a5
@proccaserra
working on upgrading isa model json schema
a125347
@proccaserra
claarifying the meaning of an attribute for isatab validator , replac…
8456ebb 
…ing mzml argument with origin
@proccaserra
porting isa model json-schema to latest json schema specification
a7a0a91
@proccaserra
cleanup of isa model json schema - related to issue469
2d0ddb3
@terazus
Merge pull request #493 from ISA-tools/master
5235dda 
Merge from master
@terazus
Merge pull request #495 from ISA-tools/master
6ce0008 
merge from master
@proccaserra
adding field Performer, associated test
27c5797
@proccaserra
fixing issue497
42b5d4b
@proccaserra
synching develop on master
05f49df
@proccaserra
Merge branch 'develop' of github.com:ISA-tools/isa-api into develop
a82f7f3
@proccaserra
fixing assertion error in test
b900691
@proccaserra
Merge branch 'master' of github.com:ISA-tools/isa-api into develop
a2a5a98
@proccaserra
upgrading github action to clear error message
b265303
@proccaserra
upgrade to second github action
b2ecfb0
@proccaserra
merging develop into issue-497-fix
4f41ecd
@proccaserra
Merge pull request #507 from ISA-tools/issue-497-fix
d246d77 
Issue 497 fix
@proccaserra
should fix issue 511
c9859d4
@proccaserra
corrections, test passing (new test)
195cf71
@proccaserra
minor edit
34f9291
@proccaserra
fixes issue #512
2f489f5
@proccaserra
fixes issue #512
034291f
@proccaserra
adding a test to check if comments on assay declaration are properly …
818332d 
…serialized in isatab2json conversion
@proccaserra
fixes issue #506 - updating to ols4
324bcd4
@proccaserra
minor fix to test
1ec71db
@proccaserra proccaserra requested a review from knirirr March 6, 2025 10:07
@proccaserra proccaserra self-assigned this Mar 6, 2025
@coveralls
Copy link

coveralls commented Mar 6, 2025 •
edited
Loading

Coverage Status

coverage: 81.281% (-3.0%) from 84.305%
when pulling 9598f14 on develop
into 972f4d8 on master.

knirirr
knirirr reviewed Mar 27, 2025
View reviewed changes
Copy link
Contributor

@knirirr knirirr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've looked through this and would benefit from further discussion if time permits.

@knirirr knirirr self-requested a review March 27, 2025 13:38
knirirr and others added 18 commits March 28, 2025 09:33
@knirirr
Fixed FutureWarning for replace in pandas.
be59559
@knirirr
Cleared FutureWarning for iloc.
4c9687c
@knirirr
Deprecation warnings, removed config printing.
294897f
@knirirr
Warning for NoneType row.
e826446
@proccaserra
Merge pull request #574 from ISA-tools/deprecation_future_warnings
1773d8c 
Deprecation future warnings
@proccaserra
updating requirements , setup files and build workflow
f8d22e0
@proccaserra
Modified .gitignore.
17775f9
@proccaserra
taking into account numpy versions to support python 3.9
a712f55
@proccaserra
taking into account numpy versions to support python 3.9 through to 3.13
61bd13c
@proccaserra
typo fix
bd5f8e8
@proccaserra
dropping support for 3.13 for now due to coveralls not being supporte…
e972edc 
…d yet
@proccaserra
correcting accidental deletion of flask-sqlalchemy requirement
258a070
@proccaserra
Update README.md
234f824 
fixing build shield
@proccaserra
Merge pull request #576 from ISA-tools/proccaserra-patch-2
a1838c9 
Update README.md
@proccaserra
adding toml file, updates to setup.py, fixing broken shield and upgra…
f497aa5 
…ding version number
@knirirr
Fixed toml file.
e5c4bab
@proccaserra
removing spurious link
36798f4
@proccaserra
Merge pull request #577 from ISA-tools/toml
9598f14 
adding toml file, updates to setup.py, fixing broken shield and ...
@proccaserra proccaserra merged commit ecd7e2e into master Apr 10, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@knirirr knirirr knirirr approved these changes

Assignees

@proccaserra proccaserra

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@proccaserra @coveralls @knirirr @terazus @ptth222