Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/conda build #319

Merged
merged 4 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,28 @@ jobs:
path: dist
key: release-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-${{ matrix.os }}

buid-conda:
runs-on: "ubuntu-24.04"
needs: [ build ]
steps:
- uses: conda-incubator/setup-miniconda@v2
with:
auto-update-conda: true
python-version: 3.10.6
# Add openfisca channel for OpenFisca-Core
channels: conda-forge, openfisca
activate-environment: true
- uses: actions/checkout@v4
with:
fetch-depth: 1 # Fetch all the tags
- name: Conda config
run: |
conda install conda-build
conda info
- name: Conda build
# See .conda/meta.yaml for more information on the built package
run: conda build --channel openfisca .conda

lint-files:
runs-on: ubuntu-20.04
needs: [ build ]
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

### 2.3.5 [#319](https://github.com/openfisca/openfisca-survey-manager/pull/319)

* Technical changes
- Fix the conda build by moving the Numpy pinning to `install_requires`.
- Add a conda build step in CI to inform the dev about a problem before merging.

### 2.3.4 [#317](https://github.com/openfisca/openfisca-survey-manager/pull/317)

* Technical changes
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

setup(
name = 'OpenFisca-Survey-Manager',
version = '2.3.4',
version = '2.3.5',
author = 'OpenFisca Team',
author_email = 'contact@openfisca.fr',
classifiers = [classifier for classifier in classifiers.split('\n') if classifier],
Expand Down Expand Up @@ -67,7 +67,6 @@
'openfisca-country-template >=7.1.5, <8.0.0',
'pytest >=8.3.3, < 9.0',
'pytest-cov >= 4.0.0, < 7.0',
"numpy >=1.24.2, <2.0",
'scipy >=1.10.1, < 2.0',
'pytest-order >=1.1.0, <2.0',
],
Expand All @@ -88,6 +87,7 @@
'chardet >=5.1.0, < 6.0',
'configparser >= 5.3.0, < 8.0',
'humanize >=4.6.0, < 5.0',
'numpy >=1.24.2, <2.0',
'openfisca-core >=43.0.0, <44.0.0',
'pandas >=2.0.3, < 3.0',
'pyarrow >= 13.0.0, < 19.0.0',
Expand Down
Loading