Skip to content

Commit

Permalink
dependencies (#9)
Browse files Browse the repository at this point in the history
* update dependencies

* update

* update

* correct schipy version

* update pypi workflow

* downgrade pip to 24.0

* downgrade pip to 24.0

* add setuptools to dependencies

* remove python from the environment.yml and add conda workflow

* latest pip in conda-forge is 24.0

* rename job

* add .run to ignore
  • Loading branch information
MAfarrag authored Jun 30, 2024
1 parent 2037f2c commit ea719af
Show file tree
Hide file tree
Showing 9 changed files with 82 additions and 29 deletions.
41 changes: 41 additions & 0 deletions .github/workflows/conda-deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: conda-deployment

on: [push]

jobs:
Run:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]
python-version: ["3.11", "3.12"]
env:
OS: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: conda-incubator/setup-miniconda@v2
with:
mamba-version: "*"
#use-mamba: true
auto-update-conda: false
environment-file: environment.yml
auto-activate-base: false
activate-environment: test
python-version: ${{ matrix.python-version }}
channels: conda-forge,defaults
channel-priority: true
show-channel-urls: true

- name: Install dev-dependencies
run: |
python -m pip install -r requirements-dev.txt
- name: Generate coverage report
shell: bash -el {0}
run: |
conda info
conda list
conda config --show-sources
conda config --show
pytest -vvv --cov=hpc
19 changes: 9 additions & 10 deletions .github/workflows/pypi-deployment.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
name: Pypi deployment
on:
push:
branches:
- main
pull_request:
branches:
- main
name: pypi-deployment
on: [push]

jobs:
Run:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ["3.9", "3.10", "3.11"]
os: [ubuntu-latest] #, windows-latest, macos-latest
python-version: ["3.11", "3.12"]

steps:
- uses: actions/checkout@v3
Expand All @@ -29,6 +24,10 @@ jobs:
- name: Generate coverage report
run: |
conda info
conda list
conda config --show-sources
conda config --show
python -m pytest -vvv --cov=hpc --cov-report=xml
- name: Upload coverage reports to Codecov with GitHub Action
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,5 @@ dmypy.json
# Pyre type checker
.pyre/
.idea/*
.vscode/*
.run/*
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
fail_fast: true
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: end-of-file-fixer
name: "[py - check] validate yaml"
Expand Down Expand Up @@ -58,7 +58,7 @@ repos:
files: ^Hapi/

- repo: https://github.com/pycqa/flake8
rev: 6.1.0
rev: 7.1.0
hooks:
- id: flake8
name: "[py - check] flake8"
Expand All @@ -70,7 +70,7 @@ repos:
# hooks:
# - id: black
- repo: https://github.com/ambv/black
rev: 23.10.1
rev: 24.4.2
hooks:
- id: black
name: "[py - format] black"
Expand Down
6 changes: 6 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,9 @@ History
------------------

* Update dependencies


0.1.3 (2024-06-24)
------------------

* Update dependencies
11 changes: 6 additions & 5 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
channels:
- conda-forge
dependencies:
- python >=3.11
- numpy >=1.25.2
- pip >=23.2.1
- pytest >=7.4.3
- pytest-cov >=4.1.0
- numpy >=2.0.0
- scipy >=1.13.1
- pip >=24.0.0
- pytest >=8.2.2
- pytest-cov >=5.0.0
- setuptools >=70.1.1
16 changes: 8 additions & 8 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
black >=23.10.1
black >=24.4.2
darglint >=1.8.1
flake8-bandit >=4.1.1
flake8-bugbear >=23.9.16
flake8-bugbear >=24.4.26
flake8-docstrings >=1.7.0
flake8-rst-docstrings >=0.3.0
pep8-naming >=0.13.3
pre-commit >=3.5.0
pre-commit-hooks >=4.5.0
pytest >=7.4.3
pytest-cov >=4.1.0
reorder-python-imports >=3.12.0
pep8-naming >=0.14.1
pre-commit >=3.7.1
pre-commit-hooks >=4.6.0
pytest >=8.2.2
pytest-cov >=5.0.0
reorder-python-imports >=3.13.0
8 changes: 6 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
numpy >=1.25.2
pip >=6.2.1
numpy >=2.0.0
pip >=24.0.0
pytest >=8.2.2
pytest-cov >=5.0.0
scipy >=1.13.1
setuptools >=70.1.1
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

setup(
name="hpc-utils",
version="0.1.3",
version="0.1.4",
description="numpy utility package",
author="Mostafa Farrag",
author_email="[email protected]",
Expand Down

0 comments on commit ea719af

Please sign in to comment.