From 2f0d377be67c7fdb7df37ebb8caf8afb3a1c06d6 Mon Sep 17 00:00:00 2001 From: Michael Hanke Date: Wed, 25 Sep 2024 10:36:48 +0200 Subject: [PATCH] ci: TMP tailor to dev scope --- .appveyor.yml | 190 ++++++++++++++++++++++++------------------------- pyproject.toml | 9 ++- 2 files changed, 103 insertions(+), 96 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 7013debb..7495d0cc 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -51,7 +51,7 @@ build: off environment: # unless indicated otherwise, we test datalad_next - DTS: datalad_next + DTS: datalad_next.config # place coverage files to a known location regardless of where a test run # is happening COVERAGE_ROOT: /home/appveyor/DLTMP @@ -158,100 +158,100 @@ environment: HATCH_DATA_DIR: /Users/appveyor/hatch-data-dir PIP_CACHE: /Users/appveyor/.cache/pip - # run a subset of the core tests on the oldest supported Python version - - job_name: datalad-core-1 - DTS: > - datalad.cli - datalad.core - # do not run tests that ensure behavior we intentionally changed - # - test_gh1811: is included in next in an alternative implementation - # - test_librarymode: assumes that CLI config overrides end up in the - # session `datalad.cfg.overrides`, but -next changes that behavior - # to have `.overrides` be uniformly limited to instance overrides - KEYWORDS: > - not test_gh1811 - and not test_librarymode - and not test_basics - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - PY: 3.9 - INSTALL_SYSPKGS: - # datalad-annex git remote needs something after git-annex_8.20211x - INSTALL_GITANNEX: git-annex -m snapshot - - job_name: datalad-core-2 - DTS: > - datalad.customremotes - datalad.dataset - datalad.distributed - datalad.downloaders - datalad.interface - # do not run tests that ensure behavior we intentionally changed - # - test_gh1811: is included in next in an alternative implementation - # - test_fake_gitlab: we have an updated variant in next - # - test_dryrun: we have an updated variant in next; what is disabled is - # the one in test_create_sibling_gitlab.py. However, there is one with - # identical name in test_create_sibling_ghlike.py, now also disabled - # because MIH does not know better - KEYWORDS: > - not test_gh1811 - and not test_nested_pushclone_cycle_allplatforms - and not test_fake_gitlab - and not test_dryrun - and not test_initremote - and not test_push_url - and not test_read_access - and not test_ria_postclone_noannex - and not test_version_check_ssh - and not test_version_check - and not test_obtain_permission_ssh - and not test_obtain_permission_root - and not test_remote_layout - and not test_remote_layout_ssh - and not test_setup_store - and not test_setup_ds_in_store - and not test_initremote_basic_fileurl - and not test_initremote_basic_httpurl - and not test_initremote_basic_httpsurl - and not test_initremote_basic_sshurl - and not test_gitannex_local - and not test_gitannex_ssh - and not test_ria_postclonecfg - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - PY: 3.9 - INSTALL_SYSPKGS: - # datalad-annex git remote needs something after git-annex_8.20211x - INSTALL_GITANNEX: git-annex -m snapshot - - job_name: datalad-core-3 - DTS: > - datalad.distribution - KEYWORDS: not test_invalid_args - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - PY: 3.9 - INSTALL_SYSPKGS: - # datalad-annex git remote needs something after git-annex_8.20211x - INSTALL_GITANNEX: git-annex -m snapshot - - job_name: datalad-core-4 - DTS: > - datalad.local - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - PY: 3.9 - INSTALL_SYSPKGS: - # datalad-annex git remote needs something after git-annex_8.20211x - INSTALL_GITANNEX: git-annex -m snapshot - KEYWORDS: > - not test_addurls_from_list - and not test_addurls_url_on_collision_error_if_different - and not test_addurls_url_on_collision_choose - - job_name: datalad-core-5 - DTS: > - datalad.runner - datalad.support - datalad.tests - datalad.ui - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - PY: 3.9 - INSTALL_SYSPKGS: - # datalad-annex git remote needs something after git-annex_8.20211x - INSTALL_GITANNEX: git-annex -m snapshot + ## run a subset of the core tests on the oldest supported Python version + #- job_name: datalad-core-1 + # DTS: > + # datalad.cli + # datalad.core + # # do not run tests that ensure behavior we intentionally changed + # # - test_gh1811: is included in next in an alternative implementation + # # - test_librarymode: assumes that CLI config overrides end up in the + # # session `datalad.cfg.overrides`, but -next changes that behavior + # # to have `.overrides` be uniformly limited to instance overrides + # KEYWORDS: > + # not test_gh1811 + # and not test_librarymode + # and not test_basics + # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 + # PY: 3.9 + # INSTALL_SYSPKGS: + # # datalad-annex git remote needs something after git-annex_8.20211x + # INSTALL_GITANNEX: git-annex -m snapshot + #- job_name: datalad-core-2 + # DTS: > + # datalad.customremotes + # datalad.dataset + # datalad.distributed + # datalad.downloaders + # datalad.interface + # # do not run tests that ensure behavior we intentionally changed + # # - test_gh1811: is included in next in an alternative implementation + # # - test_fake_gitlab: we have an updated variant in next + # # - test_dryrun: we have an updated variant in next; what is disabled is + # # the one in test_create_sibling_gitlab.py. However, there is one with + # # identical name in test_create_sibling_ghlike.py, now also disabled + # # because MIH does not know better + # KEYWORDS: > + # not test_gh1811 + # and not test_nested_pushclone_cycle_allplatforms + # and not test_fake_gitlab + # and not test_dryrun + # and not test_initremote + # and not test_push_url + # and not test_read_access + # and not test_ria_postclone_noannex + # and not test_version_check_ssh + # and not test_version_check + # and not test_obtain_permission_ssh + # and not test_obtain_permission_root + # and not test_remote_layout + # and not test_remote_layout_ssh + # and not test_setup_store + # and not test_setup_ds_in_store + # and not test_initremote_basic_fileurl + # and not test_initremote_basic_httpurl + # and not test_initremote_basic_httpsurl + # and not test_initremote_basic_sshurl + # and not test_gitannex_local + # and not test_gitannex_ssh + # and not test_ria_postclonecfg + # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 + # PY: 3.9 + # INSTALL_SYSPKGS: + # # datalad-annex git remote needs something after git-annex_8.20211x + # INSTALL_GITANNEX: git-annex -m snapshot + #- job_name: datalad-core-3 + # DTS: > + # datalad.distribution + # KEYWORDS: not test_invalid_args + # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 + # PY: 3.9 + # INSTALL_SYSPKGS: + # # datalad-annex git remote needs something after git-annex_8.20211x + # INSTALL_GITANNEX: git-annex -m snapshot + #- job_name: datalad-core-4 + # DTS: > + # datalad.local + # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 + # PY: 3.9 + # INSTALL_SYSPKGS: + # # datalad-annex git remote needs something after git-annex_8.20211x + # INSTALL_GITANNEX: git-annex -m snapshot + # KEYWORDS: > + # not test_addurls_from_list + # and not test_addurls_url_on_collision_error_if_different + # and not test_addurls_url_on_collision_choose + #- job_name: datalad-core-5 + # DTS: > + # datalad.runner + # datalad.support + # datalad.tests + # datalad.ui + # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 + # PY: 3.9 + # INSTALL_SYSPKGS: + # # datalad-annex git remote needs something after git-annex_8.20211x + # INSTALL_GITANNEX: git-annex -m snapshot # only run the CI if there are code or tooling changes diff --git a/pyproject.toml b/pyproject.toml index 79e36315..da3f6d4d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,14 +33,21 @@ classifiers = [ "Programming Language :: Python", "Programming Language :: Python :: 3", ] + dependencies = [ "annexremote", "datalad >= 0.18.4", - "datasalad >= 0.2.1", + # co-development with datasalad for now and here + #"datasalad >= 0.2.1", + "datasalad@git+https://github.com/datalad/datasalad@settings#egg=datasalad", + "humanize", "more-itertools", ] +[tool.hatch.metadata] +allow-direct-references = true + [project.urls] Homepage = "https://github.com/datalad/datalad-next" Documentation = "https://github.com/datalad/datalad-next#readme"