Skip to content

Commit

Permalink
remove setuptools from dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
lukaspie committed Jul 4, 2024
1 parent 8cd8755 commit 02f9faf
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
File renamed without changes.
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[build-system]
requires = ["setuptools>=64.0.1", "setuptools-scm[toml]>=6.2"]
backend-path = ["src/pynxtools"]
build-backend = "_build_wrapper"

[project]
Expand Down Expand Up @@ -35,7 +34,6 @@ dependencies = [
"importlib-metadata",
"lxml>=4.9.1",
"anytree",
"setuptools>=64.0.1"
]

[project.urls]
Expand Down
6 changes: 3 additions & 3 deletions tests/dataconverter/test_convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
import logging
import os
from pathlib import Path
import shutil

import click
import h5py
import pytest
from click.testing import CliRunner
from setuptools import distutils

import pynxtools.dataconverter.convert as dataconverter
from pynxtools.dataconverter.readers.base.reader import BaseReader
Expand All @@ -34,7 +34,7 @@

def move_xarray_file_to_tmp(tmp_path):
"""Moves the xarray file, which is used to test linking into the tmp_path directory."""
distutils.file_util.copy_file(
shutil.copy(
os.path.join(
os.getcwd(), "src", "pynxtools", "data", "xarray_saved_small_calibration.h5"
),
Expand All @@ -49,7 +49,7 @@ def restore_xarray_file_from_tmp(tmp_path):
os.getcwd(), "src", "pynxtools", "data", "xarray_saved_small_calibration.h5"
)
)
distutils.file_util.move_file(
shutil.move(
os.path.join(tmp_path, "xarray_saved_small_calibration.h5"),
os.path.join(
os.getcwd(), "src", "pynxtools", "data", "xarray_saved_small_calibration.h5"
Expand Down
4 changes: 2 additions & 2 deletions tests/dataconverter/test_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
import os
import xml.etree.ElementTree as ET
from typing import Optional
import shutil

import numpy as np
import pytest
from setuptools import distutils

from pynxtools.dataconverter import helpers
from pynxtools.dataconverter.template import Template
Expand Down Expand Up @@ -148,7 +148,7 @@ def fixture_filled_test_data(template, tmp_path):
# Copy original measurement file to tmp dir,
# because h5py.ExternalLink is modifying it while
# linking the nxs file.
distutils.file_util.copy_file(
shutil.copy(
os.path.join(
os.getcwd(), "src", "pynxtools", "data", "xarray_saved_small_calibration.h5"
),
Expand Down

0 comments on commit 02f9faf

Please sign in to comment.