Skip to content

Commit

Permalink
[DEVOPS-504] Cleaning for PR
Browse files Browse the repository at this point in the history
  • Loading branch information
SophieCurinier committed Oct 9, 2024
1 parent 04fe7db commit c14f439
Show file tree
Hide file tree
Showing 8 changed files with 204 additions and 2,808 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/python_deploy_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
with:
package-name: 'peak-finder-app'
python-version: '3.10'
virtual-repo-name: 'public-conda-dev'
virtual-repo-names: '["public-conda-dev"]'
secrets:
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
Expand All @@ -24,7 +24,7 @@ jobs:
package-name: 'peak-finder-app'
version-tag: ${{ github.ref_name }}
python-version: '3.10'
virtual-repo-name: 'public-pypi-dev'
virtual-repo-names: '["public-pypi-dev"]'
secrets:
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
10 changes: 5 additions & 5 deletions .github/workflows/python_deploy_prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@ name: Deploy python package in production

on:
release:
types: [published] # Trigger for draft release
types: [published]

jobs:
call-workflow-conda-publish:
name: Publish development conda package on JFrog Artifactory
name: Publish production conda package on JFrog Artifactory
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_conda_package.yml@DEVOPS-504
with:
package-name: 'peak-finder-app'
python-version: '3.10'
virtual-repo-name: 'public-conda-prod'
virtual-repo-names: '["public-conda-prod"]'
secrets:
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
call-workflow-pypi-publish:
name: Publish development pypi package on JFrog Artifactory
name: Publish production pypi package on JFrog Artifactory
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_pypi_package.yml@DEVOPS-504
with:
package-manager: 'poetry'
package-name: 'peak-finder-app'
version-tag: ${{ github.ref_name }}
python-version: '3.10'
virtual-repo-name: 'public-pypi-dev'
virtual-repo-names: '["public-pypi-prod"]'
secrets:
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,3 @@ dmypy.json

# tempory generated files
pyproject-sha.toml
/.jfrog/projects/poetry.yaml
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ repos:
exclude_types: [jupyter]
- id: check-toml
- id: check-yaml
exclude: ^meta.yaml$
# - id: check-added-large-files # crashing on some configuration. To be investigated
- id: check-case-conflict
- id: check-merge-conflict
Expand Down
2 changes: 0 additions & 2 deletions meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ package:
version: {{ version }}

source:
# url: https://github.com/MiraGeoscience/{{ name }}/archive/v{{ version }}.tar.gz
# sha256: 926956a113b9af644a6a599bfad166ba228683dff98b86abbce6282765ceac5d
path: ../{{ name }}

build:
Expand Down
2,654 changes: 0 additions & 2,654 deletions poetry.lock

This file was deleted.

Loading

0 comments on commit c14f439

Please sign in to comment.