Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Numpy 2 #53

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
build-and-publish:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: install dependencies
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,28 @@ jobs:
include:
- os: windows-2019
python-version: "3.8"
- os: macos-11
- os: macos-14
python-version: "3.8"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: setup MSVC command prompt
uses: ilammy/msvc-dev-cmd@v1
- name: install dependencies
run: |
python -m pip install --upgrade pip
pip install tox
pip install "tox <=4.14.0"
- name: run tests
run: tox
- name: run extra checks
run: |
./scripts/check-used-functions.py
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
with:
file: .tox/coverage.xml
fail_ci_if_error: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, windows-2019, macos-11]
os: [ubuntu-20.04, windows-2019, macos-14]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -55,11 +55,11 @@ jobs:
name: build sdist
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.16)

# Prevent CMake from looking for a C and a C++ compilers, as we might not
# need them. They will be found by cmake if we are using the internal chemfiles
Expand Down
2 changes: 1 addition & 1 deletion src/chemfiles/residue.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def __iter__(self):
yield self[i]

def __repr__(self):
return "[" + ", ".join([i.__repr__() for i in self]) + "]"
return "[" + ", ".join([str(int(i)) for i in self]) + "]"

def append(self, atom):
"""Add the atom index ``atom`` in the :py:class:`Residue`."""
Expand Down
1 change: 0 additions & 1 deletion tests/residue.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import copy
import unittest

import numpy as np
from _utils import remove_warnings

from chemfiles import ChemfilesError, Residue
Expand Down
Loading