Skip to content

Commit 906c5b8

Browse files
authored
Merge pull request #142 from cta-observatory/updateBuildConfig
Update build config
2 parents a7ae997 + 9693a11 commit 906c5b8

File tree

13 files changed

+77
-378
lines changed

13 files changed

+77
-378
lines changed

.github/conda/bld.bat

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/conda/build.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

.github/conda/conda_build_config.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/conda/meta.yaml

Lines changed: 0 additions & 58 deletions
This file was deleted.

.github/versionBackup.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/python-package-conda.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: CI
22

3-
on: [push]
3+
on:
4+
push:
5+
branches:
6+
- "**"
7+
tags:
8+
- "**"
9+
pull_request:
410

511
jobs:
612
build:

.github/workflows/release.yml

Lines changed: 3 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -38,71 +38,10 @@ jobs:
3838
run: |
3939
conda env update --file environment.yml --name base
4040
41-
- name: Get version
42-
run: |
43-
output=$(python dl1_data_handler/versionScript.py)
44-
echo "version=$output" >> $GITHUB_OUTPUT
45-
id: step1
46-
47-
- name: Write
48-
uses: 1arp/create-a-file-action@0.4.5
49-
with:
50-
path: '.'
51-
isAbsolutePath: true
52-
file: '.github/versionBackup.txt'
53-
content: |
54-
${{ steps.step1.outputs.version }}
55-
56-
- name: Push changes
57-
run: |
58-
git config --global user.email "rcervino@ucm.es"
59-
git config --global user.name "rcervinoucm"
60-
git status
61-
git add .
62-
git commit -m "version update" --allow-empty
63-
git push
64-
6541
- name: Build package
6642
run: |
67-
python setup.py sdist bdist_wheel # Could also be python -m build
43+
python --version
44+
pip install -U build
45+
python -m build
6846
- name: Publish package distributions to PyPI
6947
uses: pypa/gh-action-pypi-publish@release/v1
70-
71-
condapublish:
72-
strategy:
73-
matrix:
74-
os: [ubuntu-22.04]
75-
pyv: ["3.10"]
76-
max-parallel: 5
77-
runs-on: ${{ matrix.os }}
78-
permissions:
79-
id-token: write
80-
contents: write
81-
deployments: write
82-
statuses: write
83-
actions: write
84-
checks: read
85-
steps:
86-
- uses: actions/checkout@v4
87-
with:
88-
fetch-depth: 0
89-
90-
- name: Set up Python ${{ matrix.pyv }}
91-
run: |
92-
conda install -y python=${{ matrix.pyv }}
93-
94-
- name: Add conda to system path
95-
run: |
96-
# $CONDA is an environment variable pointing to the root of the miniconda directory
97-
echo $CONDA/bin >> $GITHUB_PATH
98-
99-
- name: Install dependencies
100-
run: |
101-
conda env update --file environment.yml --name base
102-
sudo apt-get install python3-numpy
103-
104-
- name: publish-to-conda
105-
uses: fcakyon/conda-publish-action@v1.3
106-
with:
107-
subdir: '.github/conda'
108-
anacondatoken: ${{ secrets.ANACONDA_TOKEN }}

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#Ignore files
22
#############
3-
3+
dl1_data_handler/_version.py
44
*.o
55
*.png
66
*.h5
77
*.simtel.gz
88
dl1_data_handler/__pycache__
99
build
1010
dist
11-
dl1_data_handler.egg-info
11+
*.egg-info/

dl1_data_handler/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22
from .processor import *
33
from .reader import *
44
from .transforms import *
5-
from .version import *
6-
7-
__version__ = get_version(pep440=False)
5+
from ._version import __version__

dl1_data_handler/version.py

Lines changed: 0 additions & 187 deletions
This file was deleted.

0 commit comments

Comments
 (0)