diff --git a/.github/workflows/fireci.yml b/.github/workflows/fireci.yml index 3748428b64d..78ba005388c 100644 --- a/.github/workflows/fireci.yml +++ b/.github/workflows/fireci.yml @@ -24,4 +24,4 @@ jobs: - run: | pytest ci/fireci - run: | - mypy --config-file ci/fireci/setup.cfg ci/fireci/ + mypy --config-file ci/fireci/pyproject.toml ci/fireci/ diff --git a/ci/fireci/pyproject.toml b/ci/fireci/pyproject.toml index 1ec2c8a9d98..a4faf8d1ac7 100644 --- a/ci/fireci/pyproject.toml +++ b/ci/fireci/pyproject.toml @@ -1,3 +1,44 @@ [build-system] -requires = ["setuptools ~= 58.0"] +requires = ["setuptools ~= 70.0"] build-backend = "setuptools.build_meta" + +[project] +name = "fireci" +version = "0.1" +dependencies = [ + "protobuf==3.20.3", + "click==8.1.7", + "google-cloud-storage==2.18.2", + "mypy==1.6.0", + "numpy==1.24.4", + "pandas==1.5.3", + "PyGithub==1.58.2", + "pystache==0.6.0", + "requests==2.31.0", + "seaborn==0.12.2", + "PyYAML==6.0.1", + "termcolor==2.4.0", + "pytest" +] + +[project.scripts] +fireci = "fireci.main:cli" + +[tool.setuptools] +packages = ["fireci", "fireciplugins"] + +[tool.mypy] +strict_optional = false + +[[tool.mypy.overrides]] + module = [ + "google.cloud", + "matplotlib", + "matplotlib.pyplot", + "pandas", + "pystache", + "requests", + "seaborn", + "yaml" + ] + ignore_missing_imports = true diff --git a/ci/fireci/setup.cfg b/ci/fireci/setup.cfg deleted file mode 100644 index 7b49519871c..00000000000 --- a/ci/fireci/setup.cfg +++ /dev/null @@ -1,45 +0,0 @@ -[metadata] -name = fireci -version = 0.1 - -[options] -install_requires = - protobuf==3.20.3 - click==8.1.7 - google-cloud-storage==2.18.2 - mypy==1.6.0 - numpy==1.24.4 - pandas==1.5.3 - PyGithub==1.58.2 - pystache==0.6.0 - requests==2.31.0 - seaborn==0.12.2 - PyYAML==6.0.1 - termcolor==2.4.0 - -[options.extras_require] -test = - pytest - -[options.entry_points] -console_scripts = - fireci = fireci.main:cli - -[mypy] -strict_optional = False -[mypy-google.cloud] -ignore_missing_imports = True -[mypy-matplotlib] -ignore_missing_imports = True -[mypy-matplotlib.pyplot] -ignore_missing_imports = True -[mypy-pandas] -ignore_missing_imports = True -[mypy-pystache] -ignore_missing_imports = True -[mypy-requests] -ignore_missing_imports = True -[mypy-seaborn] -ignore_missing_imports = True -[mypy-yaml] -ignore_missing_imports = True diff --git a/ci/run.sh b/ci/run.sh index be6e0a35a68..3647cf8082d 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -15,7 +15,12 @@ # limitations under the License. set -e +set -x DIRECTORY=$(cd `dirname $0` && pwd) -pip3 install -e $DIRECTORY/fireci >> /dev/null +python3 -m ensurepip --upgrade +python3 -m pip install --upgrade setuptools +python3 -m pip install --upgrade pip +python3 -m pip install --upgrade wheel +python3 -m pip install -e $DIRECTORY/fireci >> /dev/null fireci $@