diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6079fc7..ff3ce3c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -20,7 +20,8 @@ "customizations": { "vscode": { "extensions": [ - "mechatroner.rainbow-csv" + "mechatroner.rainbow-csv", + "piotrpalarz.vscode-gitignore-generator" ] } } diff --git a/.gitignore b/.gitignore index 2a36fc4..1a306d2 100644 --- a/.gitignore +++ b/.gitignore @@ -357,4 +357,5 @@ package # Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option) output -*.private.* \ No newline at end of file +*.private.* +conda-bld \ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..1bddac4 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "piotrpalarz.vscode-gitignore-generator" + ] +} \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 7d9e2f3..42912c1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,14 +21,14 @@ pipeline { } stage("build") { steps { - sh "build" + sh "python -m build" sh "grayskull pypi dist/*.tar.gz" - sh "conda-build automlst.engine" + sh "conda-build automlst.engine --output-folder conda-bld" } } stage("archive") { steps { - archiveArtifacts artifacts: 'dist/*.tar.gz, dist/*.whl', fingerprint: true, followSymlinks: false, onlyIfSuccessful: true + archiveArtifacts artifacts: 'dist/*.tar.gz, dist/*.whl conda-bld/**/*.conda', fingerprint: true, followSymlinks: false, onlyIfSuccessful: true } } stage("publish") { diff --git a/automlst.engine/meta.yaml b/automlst.engine/meta.yaml deleted file mode 100644 index df6ee2a..0000000 --- a/automlst.engine/meta.yaml +++ /dev/null @@ -1,43 +0,0 @@ -{% set name = "automlst.engine" %} -{% set version = "0.5.2.dev0+gb89f24a.d20250117" %} - -package: - name: {{ name|lower }} - version: {{ version }} - -source: - url: file:///workspaces/automlst.engine/dist/automlst_engine-0.5.2.dev0%2Bgb89f24a.d20250117.tar.gz - sha256: 690465cbb8da3d104b87524e0cc48696e8be9e22fe83cdc59b64ababd9177c1f - -build: - noarch: python - script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation - number: 0 - -requirements: - host: - - python >=3.11 - - setuptools >=64 - - setuptools-scm >=8 - - pip - run: - - python >=3.11 - - biopython - - aiohttp - -test: - imports: - - automlst - commands: - - pip check - requires: - - pip - -about: - summary: A library to rapidly fetch fetch MLST profiles given sequences for various diseases. - license: GPL-3.0 - license_file: LICENSE - -extra: - recipe-maintainers: - - RealYHD diff --git a/automlst_engine/meta.yaml b/automlst_engine/meta.yaml deleted file mode 100644 index b769218..0000000 --- a/automlst_engine/meta.yaml +++ /dev/null @@ -1,43 +0,0 @@ -{% set name = "automlst_engine" %} -{% set version = "0.1.1.dev21+g206a105.d20250116" %} - -package: - name: {{ name|lower }} - version: {{ version }} - -source: - url: file:///workspaces/automlst.engine/dist/automlst_engine-0.1.1.dev21+g206a105.d20250116.tar.gz - sha256: 42488314f72459563544a7e9cd2a6cbc34e7c11df478e42bf1f77bb4af3c7cdd - -build: - noarch: python - script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation - number: 0 - -requirements: - host: - - python >=3.11 - - setuptools >=64 - - setuptools-scm >=8 - - pip - run: - - python >=3.11 - - biopython - - aiohttp - -test: - imports: - - automlst.engine - commands: - - pip check - requires: - - pip - -about: - summary: A tool to rapidly fetch fetch MLST profiles given sequences for various diseases. - license: '' - license_file: PLEASE_ADD_LICENSE_FILE - -extra: - recipe-maintainers: - - RealYHD