Merge pull request #1655 from timkpaine/tkp/distfix

Small packaging and CI changes

.github/workflows/ci.yml

@@ -20,13 +20,20 @@ jobs:
       # Install Tools
       - name: Install Tools
         run: |
-          sudo apt-get install wget build-essential python3 ninja-build
+          sudo apt-get install wget build-essential ninja-build
           sudo apt-get install libevent-dev libjson-c-dev flex bison
           sudo apt-get install libfl-dev libfl2 zlib1g-dev
-          pip3 install setuptools
-          pip3 install requests
-          pip3 install pexpect
-          pip3 install meson
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.9"
+          cache: "pip"
+          cache-dependency-path: "setup.py"
+
+      - name: Install Python dependencies
+        run: |
+          python3 -m pip install setuptools requests pexpect meson
 
       # Install (n)Migen / LiteX / Cores
       - name: Install LiteX

MANIFEST.in

@@ -1,29 +1,9 @@
-graft litex/build/sim
-graft litex/soc/software
-graft litex/soc/cores/cpu/blackparrot
-graft litex/soc/cores/cpu/cortex_m1
-graft litex/soc/cores/cpu/cortex_m3
-graft litex/soc/cores/cpu/cv32e40p
-graft litex/soc/cores/cpu/cv32e41p
-graft litex/soc/cores/cpu/cva5
-graft litex/soc/cores/cpu/cva6
-graft litex/soc/cores/cpu/eos_s3
-graft litex/soc/cores/cpu/femtorv
-graft litex/soc/cores/cpu/firev
-graft litex/soc/cores/cpu/gowin_emcu
-graft litex/soc/cores/cpu/ibex
-graft litex/soc/cores/cpu/lm32
-graft litex/soc/cores/cpu/marocchino
-graft litex/soc/cores/cpu/microwatt
-graft litex/soc/cores/cpu/minerva
-graft litex/soc/cores/cpu/mor1kx
-graft litex/soc/cores/cpu/naxriscv
-graft litex/soc/cores/cpu/neorv32
-graft litex/soc/cores/cpu/openc906
-graft litex/soc/cores/cpu/picorv32
-graft litex/soc/cores/cpu/rocket
-graft litex/soc/cores/cpu/serv
-graft litex/soc/cores/cpu/vexriscv
-graft litex/soc/cores/cpu/vexriscv_smp
-graft litex/soc/cores/cpu/zynq7000
-graft litex/soc/cores/cpu/zynqmp
+graft litex
+include CHANGES.md
+include CONTRIBUTORS
+graft doc
+
+exclude litex_setup.py
+
+prune test
+

setup.py

@@ -4,9 +4,16 @@ from setuptools import setup
 from setuptools import find_packages
 
 
+with open("README.md", "r") as fp:
+    long_description = fp.read()
+
+
 setup(
     name="litex",
+    version="2022.12",
     description="Python SoC/Core builder for building FPGA based systems.",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
     author="Florent Kermarrec",
     author_email="florent@enjoy-digital.fr",
     url="http://enjoy-digital.fr",
@@ -15,10 +22,19 @@ setup(
     license="BSD",
     python_requires="~=3.6",
     install_requires=[
+        "migen",
         "packaging",
         "pyserial",
         "requests",
     ],
+    extras_require={
+        "develop": [
+          "meson"
+          "pexpect"
+          "setuptools"
+          "requests"
+        ]
+    },
     packages=find_packages(exclude=("test*", "sim*", "doc*")),
     include_package_data=True,
     package_data={
@@ -29,7 +45,7 @@ setup(
     classifiers=[
         "Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)",
         "Environment :: Console",
-        "Development Status :: Alpha",
+        "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",