From: Staf Verhaegen <staf@stafverhaegen.be>
Date: Wed, 21 Apr 2021 15:54:40 +0000 (+0200)
Subject: Merge upstream master in libre-soc master.
X-Git-Url: https://git.libre-soc.org/?p=c4m-jtag.git;a=commitdiff_plain;h=ff2b9f9be240317993ced16c18b6f3610334212c

Merge upstream master in libre-soc master.
---

ff2b9f9be240317993ced16c18b6f3610334212c
diff --cc setup.py
index 7879609,0f22531..b57c2e4
--- a/setup.py
+++ b/setup.py
@@@ -23,13 -23,7 +23,13 @@@ setup
      license="multi",
      python_requires="~=3.6",
      setup_requires=["setuptools_scm"],
 -    install_requires=["setuptools", "cocotb", "nmigen", "nmigen-soc"],
 +
 +    # removing cocotb, causing unnecessary dependency and install problems
-     install_requires=["setuptools", "nmigen", "modgrammar"],
++    install_requires=["setuptools", "nmigen", "nmigen-soc", "modgrammar"],
 +
 +    # unit tests require cocotb: main operation does not
 +    tests_require=['cocotb'],
 +
      include_package_data=True,
      packages=find_packages(),
      project_urls={