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.

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

Refactor package structure #277

Merged
merged 121 commits into from
Feb 21, 2023
Merged

Refactor package structure #277

merged 121 commits into from
Feb 21, 2023

Conversation

bleykauf
Copy link
Collaborator

@bleykauf bleykauf commented Jun 2, 2022

No description provided.

@bleykauf bleykauf mentioned this pull request Jun 2, 2022
@bleykauf
Copy link
Collaborator Author

@bleykauf bleykauf marked this pull request as ready for review February 21, 2023 09:01
@bleykauf bleykauf merged commit 3953f5d into develop Feb 21, 2023
@bleykauf bleykauf deleted the feature/packaging-refactor branch February 27, 2023 15:56
@doronbehar
Copy link
Contributor

Haven't tested it, but perhaps you can thankfully also edit linien_install_requirements.sh to accommodate for linien-org/pyrp3#2 and https://github.com/linien-org/pyrp3#installation ?

diff --git c/linien/server/linien_install_requirements.sh i/linien/server/linien_install_requirements.sh
index dee6fa6..056d167 100644
--- c/linien/server/linien_install_requirements.sh
+++ i/linien/server/linien_install_requirements.sh
@@ -19,19 +19,7 @@ mkdir linien
 
 echo 'installing pyrp3...'
 # install pyrp3
-cd /tmp/linien
-git clone https://github.com/linien-org/pyrp3.git
-cd pyrp3
-python3 setup.py install
-
-echo 'building monitor...'
-# build monitor shared library
-cd monitor
-make
-cp libmonitor.so /usr/lib/
-
-cd /tmp
-rm -R /tmp/linien
+pip install pyrp3
 
 # https://github.com/RedPitaya/RedPitaya/issues/205
 echo 'building ethernet blinking fix'
@@ -40,4 +28,4 @@ cd mdio-tool
 cmake .
 make
 rm -f /usr/bin/mdio-tool
-mv mdio-tool /usr/bin
\ No newline at end of file
+mv mdio-tool /usr/bin

@bleykauf
Copy link
Collaborator Author

bleykauf commented Mar 2, 2023

This is already incorporated into both the master branch: no more need to to call this at all in linien_install_requirements.sh, it is simply a requirement in the setup.py of linien-server.

However, I just relalized that in the develop branch there was still a merge conflict present. Thank you for bringing that to my attention :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants