* [gentoo-commits] proj/sci:master commit in: dev-python/heudiconv/files/
@ 2023-01-31 21:27 Horea Christian
0 siblings, 0 replies; 3+ messages in thread
From: Horea Christian @ 2023-01-31 21:27 UTC (permalink / raw
To: gentoo-commits
commit: d682b5bbc1c6e4f30fbe440c6b324bd5109e97be
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Tue Jan 31 21:27:08 2023 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Tue Jan 31 21:27:08 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d682b5bb
dev-python/heudiconv/files: removed unneeded files
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
.../heudiconv/files/pynwb-2.0.0-versions.patch | 21 ---------------------
.../heudiconv/files/pynwb-2.1.0-versions.patch | 21 ---------------------
.../heudiconv/files/pynwb-2.2.0-versions.patch | 21 ---------------------
3 files changed, 63 deletions(-)
diff --git a/dev-python/heudiconv/files/pynwb-2.0.0-versions.patch b/dev-python/heudiconv/files/pynwb-2.0.0-versions.patch
deleted file mode 100644
index d09c50594..000000000
--- a/dev-python/heudiconv/files/pynwb-2.0.0-versions.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/setup.py b/tmp/setup.py
-index 39e75824..f7948f64 100755
---- a/setup.py
-+++ b/setup.py
-@@ -19,11 +19,11 @@ print('found these packages:', pkgs)
- schema_dir = 'nwb-schema/core'
-
- reqs = [
-- 'h5py>=2.9,<4',
-- 'hdmf>=3.1.1,<4',
-- 'numpy>=1.16,<1.22',
-- 'pandas>=1.0.5,<2',
-- 'python-dateutil>=2.7,<3',
-+ 'h5py',
-+ 'hdmf',
-+ 'numpy',
-+ 'pandas',
-+ 'python-dateutil',
- 'setuptools'
- ]
-
diff --git a/dev-python/heudiconv/files/pynwb-2.1.0-versions.patch b/dev-python/heudiconv/files/pynwb-2.1.0-versions.patch
deleted file mode 100644
index 8c816d226..000000000
--- a/dev-python/heudiconv/files/pynwb-2.1.0-versions.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/setup.py b/tmp/setup.py
-index 39e75824..f7948f64 100755
---- a/setup.py
-+++ b/setup.py
-@@ -19,11 +19,11 @@ print('found these packages:', pkgs)
- schema_dir = 'nwb-schema/core'
-
- reqs = [
-- 'h5py>=2.10,<4',
-- 'hdmf>=3.3.2,<4',
-- 'numpy>=1.16,<1.23',
-- 'pandas>=1.0.5,<2',
-- 'python-dateutil>=2.7,<3',
-+ 'h5py',
-+ 'hdmf',
-+ 'numpy',
-+ 'pandas',
-+ 'python-dateutil',
- 'setuptools'
- ]
-
diff --git a/dev-python/heudiconv/files/pynwb-2.2.0-versions.patch b/dev-python/heudiconv/files/pynwb-2.2.0-versions.patch
deleted file mode 100644
index 6141f629a..000000000
--- a/dev-python/heudiconv/files/pynwb-2.2.0-versions.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/setup.py b/tmp/setup.py
-index 39e75824..f7948f64 100755
---- a/setup.py
-+++ b/setup.py
-@@ -19,11 +19,11 @@ print('found these packages:', pkgs)
- schema_dir = 'nwb-schema/core'
-
- reqs = [
-- 'h5py>=2.10,<4',
-- 'hdmf>=3.4.2,<4',
-- 'numpy>=1.16,<1.24',
-- 'pandas>=1.1.5,<2',
-- 'python-dateutil>=2.7.3,<3',
-+ 'h5py',
-+ 'hdmf',
-+ 'numpy',
-+ 'pandas',
-+ 'python-dateutil',
- 'setuptools'
- ]
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-python/heudiconv/files/
@ 2023-02-02 19:17 Horea Christian
0 siblings, 0 replies; 3+ messages in thread
From: Horea Christian @ 2023-02-02 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 806c356ddf61116360999d86fcc3387eec3e1376
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Thu Feb 2 19:17:07 2023 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Thu Feb 2 19:17:07 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=806c356d
dev-python/heudiconv: even better fix for tests
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
dev-python/heudiconv/files/heudiconv-0.11.6-gitenv.patch | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/dev-python/heudiconv/files/heudiconv-0.11.6-gitenv.patch b/dev-python/heudiconv/files/heudiconv-0.11.6-gitenv.patch
index 27bc441aa..23be6d000 100644
--- a/dev-python/heudiconv/files/heudiconv-0.11.6-gitenv.patch
+++ b/dev-python/heudiconv/files/heudiconv-0.11.6-gitenv.patch
@@ -13,9 +13,12 @@ new file mode 100644
index 00000000..f4f47d16
--- /dev/null
+++ b/heudiconv/tests/conftest.py
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,8 @@
+import os
-+os.environ["GIT_AUTHOR_EMAIL"] = "maxm@example.com"
-+os.environ["GIT_AUTHOR_NAME"] = "Max Mustermann"
-+os.environ["GIT_COMMITTER_EMAIL"] = "maxm@example.com"
-+os.environ["GIT_COMMITTER_NAME"] = "Max Mustermann"
++import pytest
++@pytest.fixture(autouse=True, scope="session")
++def git_env():
++ os.environ["GIT_AUTHOR_EMAIL"] = "maxm@example.com"
++ os.environ["GIT_AUTHOR_NAME"] = "Max Mustermann"
++ os.environ["GIT_COMMITTER_EMAIL"] = "maxm@example.com"
++ os.environ["GIT_COMMITTER_NAME"] = "Max Mustermann"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-python/heudiconv/files/
@ 2023-12-31 8:53 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2023-12-31 8:53 UTC (permalink / raw
To: gentoo-commits
commit: a41aaaa815f369eb11da43a27bce0fd4a98b97fa
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Dec 30 17:49:54 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 08:50:14 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a41aaaa8
dev-python/heudiconv: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../heudiconv/files/heudiconv-0.11.6-gitenv.patch | 24 ----------------------
1 file changed, 24 deletions(-)
diff --git a/dev-python/heudiconv/files/heudiconv-0.11.6-gitenv.patch b/dev-python/heudiconv/files/heudiconv-0.11.6-gitenv.patch
deleted file mode 100644
index 23be6d000..000000000
--- a/dev-python/heudiconv/files/heudiconv-0.11.6-gitenv.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0c30781248e0c1f2d437e0dfd923a74d7e647411 Mon Sep 17 00:00:00 2001
-From: Horea Christian <chr@chymera.eu>
-Date: Wed, 1 Feb 2023 21:34:58 -0500
-Subject: [PATCH] Setting git author and email in test environment
-
----
- heudiconv/tests/conftest.py | 3 +++
- 1 file changed, 3 insertions(+)
- create mode 100644 heudiconv/tests/conftest.py
-
-diff --git /dev/null b/heudiconv/tests/conftest.py
-new file mode 100644
-index 00000000..f4f47d16
---- /dev/null
-+++ b/heudiconv/tests/conftest.py
-@@ -0,0 +1,8 @@
-+import os
-+import pytest
-+@pytest.fixture(autouse=True, scope="session")
-+def git_env():
-+ os.environ["GIT_AUTHOR_EMAIL"] = "maxm@example.com"
-+ os.environ["GIT_AUTHOR_NAME"] = "Max Mustermann"
-+ os.environ["GIT_COMMITTER_EMAIL"] = "maxm@example.com"
-+ os.environ["GIT_COMMITTER_NAME"] = "Max Mustermann"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-12-31 8:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-31 21:27 [gentoo-commits] proj/sci:master commit in: dev-python/heudiconv/files/ Horea Christian
-- strict thread matches above, loose matches on Subject: below --
2023-02-02 19:17 Horea Christian
2023-12-31 8:53 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox