Merge branch 'master' into litex-sm2py
authorenjoy-digital <florent@enjoy-digital.fr>
Mon, 27 Apr 2020 20:24:10 +0000 (22:24 +0200)
committerGitHub <noreply@github.com>
Mon, 27 Apr 2020 20:24:10 +0000 (22:24 +0200)
1  2 
litex_setup.py
setup.py

diff --cc litex_setup.py
Simple merge
diff --cc setup.py
index 496c65d64c153e1aa8660ef0c6f7a3a6e4a391f4,a52d0acd87b36fc4c22cf7d10222f0de15e6b2d1..7429e92035a7e245dabe94ec479ecf364638c8aa
+++ b/setup.py
@@@ -14,24 -14,9 +14,25 @@@ setup
      test_suite="test",
      license="BSD",
      python_requires="~=3.6",
 -    install_requires=["migen", "pyserial", "requests"],
 +    install_requires=[
 +        "migen",
 +        "pyserial",
++        "requests",
 +        "pythondata-software-compiler_rt",
 +    ],
      packages=find_packages(exclude=("test*", "sim*", "doc*")),
      include_package_data=True,
 +    platforms=["Any"],
 +    keywords="HDL ASIC FPGA hardware design",
 +    classifiers=[
 +        "Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)",
 +        "Environment :: Console",
 +        "Development Status :: Alpha",
 +        "Intended Audience :: Developers",
 +        "License :: OSI Approved :: BSD License",
 +        "Operating System :: OS Independent",
 +        "Programming Language :: Python",
 +    ],
      entry_points={
          "console_scripts": [
              # full names