Skip to content

Commit

Permalink
Bugfix schema file missing on install (#341)
Browse files Browse the repository at this point in the history
* update version of GitHub Action to run pip-audit to latest release

* replace deprecated setup.py with pyproject.toml content to install packages -- note version is hard-coded because version file must be contained within the package files to be included in the package

* removed extra setup.py that may be causing issues with pip-audit GHA workflow

* install dependencies from requirements.txt on pip install

* use ubuntu 22.04 instead of latest 24.04

* skip installing dependencies on pip install for now until we can resolve versionitis between METplus Analysis packages
  • Loading branch information
georgemccabe authored Oct 15, 2024
1 parent 89895a8 commit f2e7f89
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 62 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/vulnerabilities.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ on:

jobs:
selftest:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: install
run: |
python -m venv env/
source env/bin/activate
python -m pip install .
- uses: pypa/gh-action-pip-audit@v1.0.5
- uses: pypa/gh-action-pip-audit@v1.1.0
with:
inputs: requirements.txt
virtual-environment: env/
Expand Down
25 changes: 0 additions & 25 deletions METdbLoad/setup.py

This file was deleted.

37 changes: 37 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,40 @@
[build-system]
requires = [
"setuptools",
"wheel",
]
build-backend = "setuptools.build_meta"

[project]
name = "metdataio"
#dynamic = ["dependencies"]
version = "3.0.0-beta6-dev"
description = "METplus component that loads data into a database"
authors = [
{name = "METplus"},
]
requires-python = ">=3.10.4"
readme = "README.md"
license = {text = "MIT"}
classifiers = [
"Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
]

[project.urls]
Homepage = "https://github.com/dtcenter/METdataio"

[tool.setuptools.packages]
find = {include = ["METdbLoad*", "METreadnc*", "METreformat*"]}

[tool.setuptools.package-data]
METdbLoad = [
"ush/load_specification_schema.xsd",
]

#[tool.setuptools.dynamic]
#dependencies = {file = ["requirements.txt"]}

[tool.pytest.ini_options]
addopts = "-q"
Expand Down
35 changes: 0 additions & 35 deletions setup.py

This file was deleted.

0 comments on commit f2e7f89

Please sign in to comment.