Skip to content

Commit

Permalink
Merge branch 'wip'
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolaiarocci committed Aug 30, 2024
2 parents dfce571 + e6e10ec commit bf1c913
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 13 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,15 @@ jobs:
strategy:
matrix:
include:
- { name: '3.12', python: '3.12', os: ubuntu-20.04, tox: py312, mongodb: '4.4', redis: '6' }
- { name: '3.11', python: '3.11', os: ubuntu-20.04, tox: py311, mongodb: '4.4', redis: '6' }
- { name: '3.10', python: '3.10', os: ubuntu-20.04, tox: py310, mongodb: '4.4', redis: '6' }
- { name: '3.9', python: '3.9', os: ubuntu-20.04, tox: py39, mongodb: '4.4', redis: '6' }
- { name: '3.8', python: '3.8', os: ubuntu-20.04, tox: py38, mongodb: '4.4', redis: '6' }
- { name: '3.7', python: '3.7', os: ubuntu-20.04, tox: py37, mongodb: '4.4', redis-version: '6' }
- { name: 'PyPy', python: 'pypy-3.7', os: ubuntu-20.04, tox: pypy37, mongodb: '4.4', redis: '6' }
- { name: 'PyPy', python: 'pypy-3.10', os: ubuntu-20.04, tox: pypy310, mongodb: '4.4', redis: '6' }

steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- uses: supercharge/[email protected]
Expand Down
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Patches and Contributions
- Ben Demaree
- Bjorn Andersson
- Brad P. Crochet
- Bret Curtis
- Brian Mego
- Bryan Cattle
- Carl George
Expand Down
7 changes: 6 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@ Here you can see the full list of changes between each Eve release.
In Development
---------------

- Fix: deprecation warnings in Python 3.12 (`#1526`_)
- Fix: the distribution package should not include the test suite (`#1506`_)
- Python 3.11 added to the CI matrix.
- Python 3.12 support.
- Python 3.11 support.
- Python 3.9 dropped.
- Python 3.8 dropped.
- .readthedocs.yml upgraded to V2.

.. _`#1526`: https://github.com/pyeve/eve/issues/1526
.. _`#1506`: https://github.com/pyeve/eve/issues/1506


Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ Start coding
Running the tests
~~~~~~~~~~~~~~~~~

You should have Python 3.7+ available in your system. Now
You should have Python 3.9+ available in your system. Now
running tests is as simple as issuing this command::

$ tox -e linting,py37,py38
$ tox -e linting,py310,py39

This command will run tests via the "tox" tool against Python 3.7 and 3.8 and
This command will run tests via the "tox" tool against Python 3.10 and 3.9 and
also perform "lint" coding-style checks.

You can pass different options to ``tox``. For example, to run tests on Python
Expand All @@ -131,7 +131,7 @@ Or to only run tests in a particular test module on Python 3.6::

CI will run the full suite when you submit your pull request. The full
test suite takes a long time to run because it tests multiple combinations of
Python and dependencies. You need to have Python 3.7, 3.8, 3.9, 3.10 and PyPy
Python and dependencies. You need to have Python 3.9, 3.10, 3.11, 3.12 and PyPy
installed to run all of the environments. Then run::

tox
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Eve is powered by Flask_ and Cerberus_ and it offers native support for
MongoDB_ data stores. Support for SQL, Elasticsearch and Neo4js backends is
provided by community extensions_.

The codebase is thoroughly tested under Python 3.7+, and PyPy.
The codebase is thoroughly tested under Python 3.9+, and PyPy.

Eve is Simple
-------------
Expand Down
2 changes: 1 addition & 1 deletion eve/methods/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -1531,4 +1531,4 @@ def oplog_push(resource, document, op, id=None):


def utcnow():
return datetime.utcnow().replace(microsecond=0, tzinfo=timezone.utc)
return datetime.now(timezone.utc).replace(microsecond=0)
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist=py3{11,10,9,8,7},pypy3{8,7},linting
envlist=py3{12,11,10,9},pypy3{10,9},linting

[testenv]
extras=tests
Expand Down

0 comments on commit bf1c913

Please sign in to comment.