diff --git a/.github/workflows/build_latest_container.yaml b/.github/workflows/build_latest_container.yaml index 1b0b516..7226da7 100644 --- a/.github/workflows/build_latest_container.yaml +++ b/.github/workflows/build_latest_container.yaml @@ -49,8 +49,6 @@ jobs: python3 -m pip install build - name: Build package run: python3 -m build - - name: Build bdist package - run: python3 setup.py bdist_wheel - name: Install snow run: pip install dist/*.tar.gz - name: Upload artifacts diff --git a/config.py b/config.py deleted file mode 100644 index f77005e..0000000 --- a/config.py +++ /dev/null @@ -1,20 +0,0 @@ -import time - -datapath = ["~/.casa/data"] -rundata = "~/.casa/data/rsync" -logfile = 'casalog-%s.log' % time.strftime("%Y%m%d-%H", time.localtime()) -telemetry_enabled = True -crashreporter_enabled = True -nologfile = False -log2term = True -nologger = True -nogui = False -colors = "LightBG" -agg = False -pipeline = False -iplog = True -user_site = False -telemetry_log_directory = "/tmp" -telemetry_log_limit = 20000 -telemetry_log_size_interval = 60 -telemetry_submit_interval = 604800 diff --git a/environment.yml b/environment.yml index 733ffd6..25217f8 100644 --- a/environment.yml +++ b/environment.yml @@ -1,26 +1,25 @@ name: snow-env dependencies: - python=3.10 -- numpy=1.24 +- numpy=1.26 - matplotlib - mpi4py - anaconda - pip - pip: + - almatasks==0.0.0.3 - astropy==6.1.0 - - casadata==2024.1.15 - - casafeather==0.0.20 - - casalogger==1.0.17 - - casampi==0.5.4 - - casaplotms==2.3.4 - - casaplotserver==1.7.1 - - casashell==6.6.3.22 - - casatablebrowser==0.0.33 - - casatasks==6.6.3.22 - - casatestutils==6.6.3.22 - - casatools==6.6.3.22 - - casaviewer==2.0.1 - - numpy==1.24.3 + - casafeather==0.0.22 + - casalogger==1.0.19 + - casampi==0.5.5 + - casaplotms==2.4.3 + - casaplotserver==1.8.2 + - casashell==6.6.4.34 + - casatablebrowser==0.0.35 + - casatasks==6.6.4.34 + - casatestutils==6.6.4.34 + - casatools==6.6.4.34 + - casaviewer==2.1.4 - python-casacore==3.5.2 - - reproject==0.11.0 - - scipy==1.11.4 + - reproject==0.13.1 + - scipy==1.13.1 diff --git a/pyproject.toml b/pyproject.toml index d7a13c5..a8718ee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] build-backend = "setuptools.build_meta" -requires = ["setuptools>=65.5.0", "setuptools-scm", "wheel"] +requires = ["setuptools>=70.0.0", "setuptools-scm", "wheel"] [project] authors = [ @@ -10,15 +10,34 @@ classifiers = [ "Programming Language :: Python :: 3", "Operating System :: OS Independent" ] +dependencies = [ + "almatasks==0.0.0.3", + "astropy==6.1.0", + "casafeather==0.0.22", + "casalogger==1.0.19", + "casampi==0.5.5", + "casaplotms==2.4.3", + "casaplotserver==1.8.2", + "casashell==6.6.4.34", + "casatablebrowser==0.0.35", + "casatasks==6.6.4.34", + "casatestutils==6.6.4.34", + "casatools==6.6.4.34", + "casaviewer==2.1.4", + "numpy==1.26.0", + "python-casacore==3.5.2", + "reproject==0.11.0", + "scipy==1.11.4" +] description = "A Python object oriented framework to do radio-interferometric self-calibration" -dynamic = ["version", "dependencies"] -license = {text = "GNU GPL"} +dynamic = ["version"] +license = {file = "LICENSE"} maintainers = [ {name = "Miguel Cárcamo", email = "miguel.carcamo@manchester.ac.uk"} ] name = "snow" readme = "README.md" -requires-python = ">=3.10, <=3.11" +requires-python = ">=3.10, <3.11" [project.urls] Source = "https://github.com/miguelcarcamov/snow" @@ -29,4 +48,5 @@ namespaces = false where = ["src"] [tool.setuptools_scm] +local_scheme = "no-local-version" write_to = "src/snow/_version.py" diff --git a/requirements.txt b/requirements.txt index 7ce4bf6..cd60df6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,17 +1,17 @@ +almatasks==0.0.0.3 astropy==6.1.0 -casadata==2024.1.15 -casafeather==0.0.20 -casalogger==1.0.17 -casampi==0.5.4 -casaplotms==2.3.4 -casaplotserver==1.7.1 -casashell==6.6.3.22 -casatablebrowser==0.0.33 -casatasks==6.6.3.22 -casatestutils==6.6.3.22 -casatools==6.6.3.22 -casaviewer==2.0.1 -numpy==1.24.3 +casafeather==0.0.22 +casalogger==1.0.19 +casampi==0.5.5 +casaplotms==2.4.3 +casaplotserver==1.8.2 +casashell==6.6.4.34 +casatablebrowser==0.0.35 +casatasks==6.6.4.34 +casatestutils==6.6.4.34 +casatools==6.6.4.34 +casaviewer==2.1.4 +numpy==1.26.0 python-casacore==3.5.2 reproject==0.11.0 scipy==1.11.4 diff --git a/setup.py b/setup.py deleted file mode 100644 index c7b85c8..0000000 --- a/setup.py +++ /dev/null @@ -1,61 +0,0 @@ -from pathlib import Path -from typing import List - -from setuptools import setup - -this_directory = Path(__file__).parent - - -def get_requirements(filename: str, remove_links=True) -> List[str]: - """ - lists the requirements to install. - """ - with open(filename) as f: - requirements = f.read().splitlines() - if remove_links: - for requirement in requirements: - # git repository url. - if requirement.startswith("git+"): - requirements.remove(requirement) - # subversion repository url. - if requirement.startswith("svn+"): - requirements.remove(requirement) - # mercurial repository url. - if requirement.startswith("hg+"): - requirements.remove(requirement) - return requirements - - -def get_links(filename: str) -> List[str]: - """ - gets URL Dependency links. - """ - links_list = get_requirements(filename, remove_links=False) - for link in links_list: - keep_link = False - already_removed = False - # git repository url. - if not link.startswith("git+"): - if not link.startswith("svn+"): - if not link.startswith("hg+"): - links_list.remove(link) - already_removed = True - else: - keep_link = True - if not keep_link and not already_removed: - links_list.remove(link) - already_removed = True - else: - keep_link = True - if not keep_link and not already_removed: - links_list.remove(link) - return links_list - - -if __name__ == "__main__": - use_scm_version = {"root": ".", "relative_to": __file__, "local_scheme": "no-local-version"} - setup( - use_scm_version=use_scm_version, - install_requires=get_requirements("requirements.txt"), - dependency_links=get_links("requirements.txt") - )