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

Non-canonical sorting for bit2fasm #616

Merged
merged 4 commits into from Feb 7, 2019

Conversation

litghost
Copy link
Contributor

@litghost litghost commented Feb 7, 2019

No description provided.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
@litghost litghost requested a review from mithro February 7, 2019 01:12
@litghost litghost changed the title Non-canonical sorting for FASM Non-canonical sorting for bit2fasm Feb 7, 2019
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
Makefile Outdated
@@ -7,7 +7,7 @@ env:
$(IN_ENV) pip install -r requirements.txt
$(IN_ENV) pip install -r docs/requirements.txt
ln -sf $(PWD)/prjxray env/lib/python3.*/site-packages/
ln -sf $(PWD)/third_party/fasm/fasm.py env/lib/python3.*/site-packages/
ln -sf $(PWD)/third_party/fasm/ env/lib/python3.*/site-packages/
Copy link
Contributor

Choose a reason for hiding this comment

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

Lets merge this, but we should probably be using something like $(IN_ENV) pip install --develop third_party/fasm.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It still is not passing, different symptom, similiar failure:

==================================== ERRORS ====================================
______________________ ERROR collecting utils/bit2fasm.py ______________________
utils/bit2fasm.py:8: in <module>
    import fasm.output
E   ModuleNotFoundError: No module named 'fasm.output'
 generated xml file: /home/travis/build/SymbiFlow/prjxray/build/py_test_results.xml 
!!!!!!!!!!!!!!!!!!! Interrupted: 1 errors during collection !!!!!!!!!!!!!!!!!!!!
=========================== 1 error in 0.50 seconds ============================
make: *** [test-py] Error 2
The command "make test-py" exited with 2.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
@litghost litghost merged commit 8e70e4e into f4pga:master Feb 7, 2019
@litghost litghost deleted the non_canonical_sorting branch February 7, 2019 02:15
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.

None yet

2 participants