Skip to content
This repository has been archived by the owner on May 20, 2020. It is now read-only.

Improve conda #244

Closed
wants to merge 36 commits into from
Closed

Improve conda #244

wants to merge 36 commits into from

Conversation

fdiblen
Copy link

@fdiblen fdiblen commented May 19, 2020

Version 0.3.2

This PR includes the changes in #241

Refs: #242 #227 #139

Changed

  • improve conda workflow #244
    • merge anaconda and python build workflows
    • fix conda package install command in build workflow
    • publish only on ubuntu machine
  • data folder is handled by setup.py but not meta.yml
  • split workflows into two parts
  • install conda package generated by the workflow
  • test conda packages on windows and unix separately
  • update workflow names
  • use default settings for conda action

Removed

  • remove python build badge #244
  • Moved spec2vec similarity related functionality from matchms to iomega/spec2vec
  • removed build step in build workflow
  • removed conda build scripts: conda/build.sh and conda/bld.bat
  • removed conda/condarc.yml
  • removed conda_build_config.yaml

@fdiblen fdiblen marked this pull request as ready for review May 19, 2020 21:52
@sverhoeven
Copy link
Member

I dont like the data cp at https://github.com/matchms/matchms/blob/improve-conda/conda/build.sh#L10, this should not be needed. Did you try to use package_data in setup.py? For example https://github.com/3D-e-Chem/sygma/blob/master/setup.py#L44

@fdiblen
Copy link
Author

fdiblen commented May 20, 2020

I dont like the data cp at https://github.com/matchms/matchms/blob/improve-conda/conda/build.sh#L10, this should not be needed. Did you try to use package_data in setup.py? For example https://github.com/3D-e-Chem/sygma/blob/master/setup.py#L44

Changed in eda8b12. Testing now...

setup.py Outdated Show resolved Hide resolved
.github/workflows/conda_build.yml Show resolved Hide resolved
.github/workflows/conda_build.yml Outdated Show resolved Hide resolved
.github/workflows/conda_build.yml Outdated Show resolved Hide resolved
conda/build.sh Outdated Show resolved Hide resolved
setup.py Outdated Show resolved Hide resolved
@jspaaks
Copy link
Member

jspaaks commented May 20, 2020

and merge changlog entries for unreleased and 0.3.2

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
- name: Deactivate matchms-dev environment
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you doing something else now, the single job is a bit long for me. Can you split it up in 2 jobs which depend on each other:

Suggested change
- name: Deactivate matchms-dev environment
condabuild:
name: Python ${{ matrix.python-version }} / ${{ matrix.os }}
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
needs: build
steps:
- uses: actions/checkout@v2
with:
fetch-depth: '0'

Then you don't need to deactivate a env, but need to checkout.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added in bb75b60

@sverhoeven
Copy link
Member

I do not see the build job in https://github.com/matchms/matchms/actions/runs/110289735 run. There is a parse error of the yml file.

You need to add the strategy from the analysis job also to the build job, or maybe move strategy to defaults section.

Copy link
Member

@sverhoeven sverhoeven left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build job does not run, see possible solution in matchms/matchms#244 (comment)

@sonarcloud
Copy link

sonarcloud bot commented May 20, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@fdiblen
Copy link
Author

fdiblen commented May 20, 2020

The PR moved to matchms/matchms#31

@fdiblen fdiblen closed this May 20, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants