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

Add SystemRDL file type #48

Merged
merged 10 commits into from
Jul 30, 2023
Merged

Add SystemRDL file type #48

merged 10 commits into from
Jul 30, 2023

Conversation

RasmusGOlsen
Copy link

New Features

Add SystemRDL source file type for solving feature request #47

@Paebbels Paebbels mentioned this pull request Jun 18, 2023
Open
Paebbels
Paebbels requested changes Jun 18, 2023
View reviewed changes
pyEDAA/ProjectModel/__init__.py Outdated Show resolved Hide resolved
pyEDAA/ProjectModel/__init__.py Show resolved Hide resolved
pyEDAA/ProjectModel/__init__.py Outdated Show resolved Hide resolved
pyEDAA/ProjectModel/__init__.py Outdated Show resolved Hide resolved
pyEDAA/ProjectModel/pySRDLModel.py Outdated Show resolved Hide resolved
RasmusGOlsen pushed a commit to RasmusGOlsen/pyEDAA.ProjectModel that referenced this pull request Jun 18, 2023
Update Design and FileSet classes
c0d6b66 
Updated classes to support SystemRDL version. Removed the pySRDLModel
from the repsitory. The pySRDLModel needs to be a new Python package
and released to PyPi, before pull request edaa-org#48 can be accepted.
@Paebbels Paebbels mentioned this pull request Jun 18, 2023
Merged
Paebbels
Paebbels reviewed Jun 18, 2023
View reviewed changes
pyEDAA/ProjectModel/__init__.py Outdated Show resolved Hide resolved
pyEDAA/ProjectModel/__init__.py Show resolved Hide resolved
@Paebbels Paebbels changed the base branch from main to dev June 18, 2023 23:11
@Paebbels
Copy link
Member

@RasmusGOlsen looks like this PR needs a merge or rebase to get merged. I tried to fix it online, but looks like I have no rights to do so.

Maybe you unchecked the checkbox that the maintainer can push to your branch to resolve conflicts.
(I never needed that feature before, but I get asked this question myself when I create PRs at other places.)

@Paebbels
Copy link
Member

Oh, and a reference in requirements.txt is needed.

@Paebbels Paebbels mentioned this pull request Jul 30, 2023
Draft
Rasmus Olsen and others added 4 commits July 30, 2023 13:12
Add SystemRDL file type
2e3526d
@RasmusGOlsen @Paebbels
Update pyEDAA/ProjectModel/__init__.py
a55ef62 
Co-authored-by: Patrick Lehmann <Paebbels@gmail.com>
@RasmusGOlsen @Paebbels
Update pyEDAA/ProjectModel/__init__.py
eacd482 
Co-authored-by: Patrick Lehmann <Paebbels@gmail.com>
@RasmusGOlsen @Paebbels
Update pyEDAA/ProjectModel/__init__.py
27377f2 
Co-authored-by: Patrick Lehmann <Paebbels@gmail.com>
@RasmusGOlsen
Copy link
Author

@RasmusGOlsen looks like this PR needs a merge or rebase to get merged. I tried to fix it online, but looks like I have no rights to do so.

Maybe you unchecked the checkbox that the maintainer can push to your branch to resolve conflicts. (I never needed that feature before, but I get asked this question myself when I create PRs at other places.)

I think it should be checked.

Rasmus Olsen added 2 commits July 30, 2023 13:34
Update Design and FileSet classes
18f925e 
Updated classes to support SystemRDL version. Removed the pySRDLModel
from the repsitory. The pySRDLModel needs to be a new Python package
and released to PyPi, before pull request edaa-org#48 can be accepted.
Update requirements
1824596 
Added pySystemRDL to the requirements.
@RasmusGOlsen
Copy link
Author

Oh, and a reference in requirements.txt is needed.

I now updated the requirements.txt to include pySystemRDLModel, but this package needs to be uploaded to PyPi before this pull request can be accepted.

@Paebbels
Copy link
Member

I released v0.1.0 at pySystemRDLModel to PyPI, so we can go on here.

Paebbels
Paebbels reviewed Jul 30, 2023
View reviewed changes
requirements.txt Outdated Show resolved Hide resolved
@Paebbels Paebbels merged commit 6bf6d06 into edaa-org:dev Jul 30, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Paebbels Paebbels Paebbels requested changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@RasmusGOlsen @Paebbels