Skip to content

Commit

Permalink
Add ArtemisDataCollector
Browse files Browse the repository at this point in the history
  • Loading branch information
rosswhitfield committed Dec 2, 2024
1 parent aa22e22 commit e6c7ea0
Show file tree
Hide file tree
Showing 19 changed files with 418 additions and 451 deletions.
73 changes: 0 additions & 73 deletions .github/workflows/package.yml

This file was deleted.

14 changes: 2 additions & 12 deletions .github/workflows/unittest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
use-mamba: true
environment-file: environment.yml
activate-environment: test
- name: install additional dependencies
- name: install
run: |
echo "installing additional dependencies if cannot be installed from conda"
python -m pip install -e .
- name: run unit tests
run: |
echo "running unit tests"
Expand All @@ -35,13 +35,3 @@ jobs:
github.actor != 'dependabot[bot]'
with:
token: ${{ secrets.CODECOV_TOKEN }}
- name: build conda package
run: |
# test that the conda package builds
cd conda.recipe
echo "versioningit $(versioningit ../)"
# conda channels could have been defined in the conda-incubator, but you can copy/paste the lines
# below to build the conda package in your local machine
CHANNELS="--channel mantid/label/main --channel conda-forge"
VERSION=$(versioningit ../) conda mambabuild $CHANNELS --output-folder . .
conda verify noarch/mypackagename*.tar.bz2
34 changes: 5 additions & 29 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,44 +1,20 @@
name: mypythonapp
name: artemis_data_collector
channels:
- conda-forge
dependencies:
# -- Runtime dependencies
# base: list all base dependencies here
- python>=3.8 # please specify the minimum version of python here
- python>=3.12 # please specify the minimum version of python here
- versioningit
# compute: list all compute dependencies here
- numpy
- pandas
# plot: list all plot dependencies here, if applicable
- matplotlib
# jupyter: list all jupyter dependencies here, if applicable
- jupyterlab
- ipympl
- psycopg>=3.2
- requests
- stomp.py
# -- Development dependencies
# utils:
- pre-commit
# package building:
- libmamba
- libarchive
- anaconda-client
- boa
- conda-build < 4 # conda-build 24.x has a bug, missing update_index from conda_build.index
- conda-verify
- python-build
- twine # for uploading to pypi and testpypi
# docs
- sphinx
- sphinx_rtd_theme
- myst-parser # required for parsing markdown files
# test: list all test dependencies here
- pytest
- pytest-cov
- pytest-xdist
# --------------------------------------------------
# add additional sections such as Qt, etc. if needed
# --------------------------------------------------
# if packages are not available on conda, list them here
- pip
- pip:
- bm3d-streak-removal # example
- pytest-playwright
27 changes: 0 additions & 27 deletions notebooks/example.ipynb

This file was deleted.

22 changes: 8 additions & 14 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[project]
name = "examplepyapp"
description = "Example Python repo for neutrons"
name = "artemis_data_collector"
description = "Artemis Data Collector"
dynamic = ["version"]
requires-python = ">=3.10"
requires-python = ">=3.12"
dependencies = [
# list all runtime dependencies here
]
Expand All @@ -11,10 +11,10 @@ keywords = ["neutrons", "example", "python"]
readme = "README.md"

[project.urls]
homepage = "https://github.com/neutrons/python_project_template/" # if no homepage, use repo url
repository = "https://github.com/neutrons/python_project_template/"
homepage = "https://github.com/neutrons/artemis_data_collector/" # if no homepage, use repo url
repository = "https://github.com/neutrons/artemis_data_collector/"
# documentation = add_url_to_readthedoc_here
issues = "https://github.com/neutrons/python_project_template/issues"
issues = "https://github.com/neutrons/artemis_data_collector/issues"

[build-system]
requires = [
Expand All @@ -38,7 +38,7 @@ dirty = "{version}+d{build_date:%Y%m%d}"
distance-dirty = "{next_version}.dev{distance}+d{build_date:%Y%m%d%H%M}"

[tool.versioningit.write]
file = "src/packagenamepy/_version.py"
file = "src/artemis_data_collector/_version.py"

[tool.setuptools.packages.find]
where = ["src"]
Expand All @@ -48,10 +48,7 @@ exclude = ["tests*", "scripts*", "docs*", "notebooks*"]
"*" = ["*.yml","*.yaml","*.ini"]

[project.scripts]
packagename-cli = "packagenamepy.packagename:main"

[project.gui-scripts]
packagenamepy = "packagenamepy.packagename:gui"
artemis_data_collector = "artemis_data_collector.artemis_data_collector:main"

[tool.pytest.ini_options]
pythonpath = [
Expand All @@ -60,9 +57,6 @@ pythonpath = [
testpaths = ["tests"]
python_files = ["test*.py"]
norecursedirs = [".git", "tmp*", "_tmp*", "__pycache__", "*dataset*", "*data_set*"]
markers = [
"mymarker: example markers goes here"
]

[tool.ruff]
line-length = 120
Expand Down
2 changes: 0 additions & 2 deletions scripts/myscripts.py

This file was deleted.

Loading

0 comments on commit e6c7ea0

Please sign in to comment.