[med-svn] [Git][med-team/snakemake][debian-v7] Use platformdirs not appdirs. (Closes: #1068010)

[Rebecca N. Palmer (@rnpalmer-guest)]

Rebecca N. Palmer pushed to branch debian-v7 at Debian Med / snakemake


Commits:
eab1f679 by Rebecca N. Palmer at 2024-04-07T11:37:26+01:00
Use platformdirs not appdirs.  (Closes: #1068010)

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/1068010_appdirs_to_platformdirs.patch
- debian/patches/fstring.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+snakemake (7.32.4-3) unstable; urgency=medium
+
+  * Use platformdirs not appdirs.  (Closes: #1068010)
+
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sun, 07 Apr 2024 11:37:02 +0100
+
 snakemake (7.32.4-2) unstable; urgency=medium
 
   * Tests: don't mix tabs and spaces, as Python 3.12 rejects this.


=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends: ca-certificates,
                environment-modules,
                imagemagick,
                python3,
-               python3-appdirs <!nocheck>,
+               python3-platformdirs <!nocheck>,
                python3-biopython <!nocheck>,
                python3-boto3 <!nocheck>,
                python3-botocore <!nocheck>,
@@ -66,7 +66,7 @@ Architecture: all
 Depends: ${misc:Depends},
          ${python3:Depends},
          ca-certificates,
-         python3-appdirs,
+         python3-platformdirs,
          python3-configargparse,
          python3-datrie,
          python3-docutils,


=====================================
debian/patches/1068010_appdirs_to_platformdirs.patch
=====================================
@@ -0,0 +1,82 @@
+Description: Use platformdirs not appdirs
+
+(I suspect it's an (unrelated) bug that it appears twice
+in test-environment.yml)
+
+Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
+Bug-Debian: https://bugs.debian.org/1068010
+Forwarded: no
+
+--- a/doc-environment.yml
++++ b/doc-environment.yml
+@@ -6,7 +6,7 @@ dependencies:
+   - wrapt
+   - pyyaml
+   - requests
+-  - appdirs
++  - platformdirs
+   - docutils
+   - ratelimiter
+   - configargparse
+--- a/docs/executing/cli.rst
++++ b/docs/executing/cli.rst
+@@ -15,7 +15,7 @@ Important environment variables
+ -------------------------------
+ 
+ Snakemake caches source files for performance and reproducibility.
+-The location of this cache is determined by the `appdirs <https://github.com/ActiveState/appdirs>`_ package.
++The location of this cache is determined by the `platformdirs <https://github.com/platformdirs/platformdirs>`_ package.
+ If you want to change the location on a unix/linux system, you can define an override path via the environment variable ``XDG_CACHE_HOME``.
+ 
+ .. user_manual-snakemake_options:
+--- a/docs/requirements.txt
++++ b/docs/requirements.txt
+@@ -5,4 +5,4 @@ sphinx_rtd_theme
+ docutils
+ myst-parser
+ configargparse
+-appdirs
+\ No newline at end of file
++platformdirs
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -33,7 +33,7 @@ include_package_data = False
+ packages = find:
+ python_requires = >=3.7
+ install_requires =
+-    appdirs
++    platformdirs
+     configargparse
+     connection_pool >=0.0.3
+     datrie
+--- a/snakemake/common/__init__.py
++++ b/snakemake/common/__init__.py
+@@ -82,7 +82,7 @@ RULEFUNC_CONTEXT_MARKER = "__is_snakemak
+ def get_appdirs():
+     global APPDIRS
+     if APPDIRS is None:
+-        from appdirs import AppDirs
++        from platformdirs import AppDirs
+ 
+         APPDIRS = AppDirs("snakemake", "snakemake")
+     return APPDIRS
+--- a/test-environment.yml
++++ b/test-environment.yml
+@@ -22,7 +22,7 @@ dependencies:
+   - responses
+   - dropbox
+   - numpy
+-  - appdirs
++  - platformdirs
+   - pytools
+   - docutils
+   - pygments
+@@ -38,7 +38,7 @@ dependencies:
+   - oauth2client
+   - azure-storage-blob
+   - configargparse
+-  - appdirs
++  - platformdirs
+   - python-irodsclient <1.1.2 # bug in 1.1.2 leads to KeyError
+   - cwltool
+   - cwl-utils


=====================================
debian/patches/fstring.patch
=====================================
@@ -144,7 +144,7 @@ Author: Hocnonsense, Rebecca N. Palmer <rebecca_palmer at zoho.com>
 +    return join_compilation, linemap, snakefile.rulecount
 --- /dev/null
 +++ b/tests/test_fstring/expected-results/SID23454678.txt
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +rrr
 --- /dev/null
 +++ b/tests/test_fstring/Snakefile


=====================================
debian/patches/series
=====================================
@@ -17,3 +17,4 @@ skip-test-lint_long_run.patch
 skip-test_workflow_calling.patch
 no_mix_tabs_spaces.patch
 fstring.patch
+1068010_appdirs_to_platformdirs.patch



View it on GitLab: https://salsa.debian.org/med-team/snakemake/-/commit/eab1f679f0bbb1f5f7ede44272c61ec02d0e044f

-- 
View it on GitLab: https://salsa.debian.org/med-team/snakemake/-/commit/eab1f679f0bbb1f5f7ede44272c61ec02d0e044f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20240407/531d6d0f/attachment-0001.htm>