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

chore: remove deprecated items #6580

Merged
merged 21 commits into from
Sep 5, 2023
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 2 additions & 12 deletions .circleci/config.templ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -449,12 +449,12 @@ jobs:
- run_test:
pattern: 'vendor'

boto:
botocore:
<<: *machine_executor
parallelism: 6
steps:
- run_test:
pattern: '^boto' # run boto and botocore
pattern: 'botocore'
snapshot: true
docker_services: "localstack"

Expand Down Expand Up @@ -493,16 +493,6 @@ jobs:
snapshot: true
docker_services: 'postgres'

pylons:
<<: *contrib_job_small
docker:
- image: *ddtrace_dev_image
- *testagent
steps:
- run_test:
pattern: 'pylons'
trace_agent_url: "http://localhost:8126"

aiohttp:
<<: *machine_executor
parallelism: 3
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ jobs:
workflows:
setup:
jobs:
- setup
- setup
63 changes: 0 additions & 63 deletions .github/workflows/build_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,68 +24,6 @@ on:
- cron: 0 2 * * 2-6

jobs:
build_wheels_py27_35:
name: Build and test wheels on ${{ matrix.os }} (${{ matrix.archs }})
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- os: ubuntu-latest
archs: x86_64 i686
- os: ubuntu-latest
archs: aarch64
- os: windows-latest
archs: AMD64 x86
- os: macos-latest
# universal2 and arm64 builds require CPython 3.8 or newer:
# https://cibuildwheel.readthedocs.io/en/stable/faq/#universal2
archs: x86_64 universal2
steps:
- uses: actions/checkout@v3
# Include all history and tags
with:
fetch-depth: 0

- uses: actions/setup-python@v4
name: Install Python
with:
python-version: '3.8'

- name: Set up QEMU
if: runner.os == 'Linux'
uses: docker/setup-qemu-action@v2
with:
platforms: all

- name: Build wheels python 2.7 and 3.5
uses: joerick/cibuildwheel@v1.12.0
env:
# configure cibuildwheel to build native archs ('auto'), and some
# emulated ones
CIBW_ARCHS: ${{ matrix.archs }}
# PyPY is not supported
# Windows 2.7 wheels no longer can be built https://github.com/DataDog/dd-trace-py/pull/2344
CIBW_SKIP: cp27-win*
CIBW_BUILD: cp27* cp35*
# Run a smoke test on every supported platform
CIBW_TEST_COMMAND: python {project}/tests/smoke_test.py
# Testing arm on MacOS is currently not supported by Github
CIBW_TEST_SKIP: "*-macosx_universal2:arm64"
# Workaround for Macos 11.0 versioning issue, a.k.a.
# `platform.mac_ver()` reports incorrect MacOS version at 11.0
# See: https://stackoverflow.com/a/65402241
CIBW_ENVIRONMENT_MACOS: SYSTEM_VERSION_COMPAT=0
CMAKE_BUILD_PARALLEL_LEVEL: 12

- uses: actions/upload-artifact@v3
with:
path: ./wheelhouse/*.whl

build_wheels_py36:
uses: ./.github/workflows/build_python_3.yml
with:
cibw_build: 'cp36*'

build_wheels_py37:
uses: ./.github/workflows/build_python_3.yml
with:
Expand Down Expand Up @@ -171,7 +109,6 @@ jobs:

upload_pypi:
needs:
- build_wheels_py27_35
- build_wheels_py36
- build_wheels_py37
- build_wheels_py38
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Changelog
on:
push:
branches:
- master
- 0.x
- 1.x
pull_request:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ name: "CodeQL"
on:
push:
branches:
- master
- 0.x
- 1.x
pull_request:
# The branches below must be a subset of the branches above
branches:
- master
- 0.x
- 1.x

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/requirements-locks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

- name: Set python interpreters
run: pyenv global 3.10 2.7 3.5 3.6 3.7 3.8 3.9 3.11
run: pyenv global 3.10 3.7 3.8 3.9 3.11

- name: Install Dependencies
run: pip install --upgrade pip && pip install riot
Expand Down
47 changes: 0 additions & 47 deletions .github/workflows/test_frameworks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Framework tests
on:
push:
branches:
- master
- 0.x
- 1.x
pull_request:
Expand Down Expand Up @@ -528,52 +527,6 @@ jobs:
# Disable tests checking GC references since profiling can interfere
run: ddtrace-run python -m pytest -k 'not test_record_gc and not test_record_get and not test_record_items and not test_record_iter' tests

pylons-testsuite-1_0_3:
name: Pylons 1.0.3
runs-on: "ubuntu-20.04"
needs: needs-run
# Ubuntu 20.04 is the last version of ubuntu on github setup actions to provide Python 2.7.
container:
image: python:2.7.18-buster
env:
DD_TESTING_RAISE: true
PYTHONPATH: ../ddtrace/tests/debugging/exploration/
CMAKE_BUILD_PARALLEL_LEVEL: 12
defaults:
run:
working-directory: pylons
steps:
- uses: actions/checkout@v3
if: needs.needs-run.outputs.outcome == 'success'
with:
path: ddtrace
- uses: actions/checkout@v3
if: needs.needs-run.outputs.outcome == 'success'
with:
repository: pylons/pylons
ref: master
path: pylons
- name: Install ddtrace
if: needs.needs-run.outputs.outcome == 'success'
run: pip install ../ddtrace
- name: Install test dependencies
if: needs.needs-run.outputs.outcome == 'success'
run: pip install -e .[test]
- name: Pin PasteDeploy to Python 2.7 compatible version
if: needs.needs-run.outputs.outcome == 'success'
run: pip install pastedeploy==2.1.1
- name: MarkupSafe fix
if: needs.needs-run.outputs.outcome == 'success'
run: pip install --upgrade MarkupSafe==0.18 pip setuptools --force
- name: Disable failing tests
if: needs.needs-run.outputs.outcome == 'success'
run: |
sed -i'' "s/test_detect_lang/detect_lang/g" tests/test_units/test_basic_app.py
sed -i'' "s/test_langs/langs/g" tests/test_units/test_basic_app.py
- name: Run tests
if: needs.needs-run.outputs.outcome == 'success'
run: nosetests

gunicorn-testsuite-20_1_0:
name: gunicorn 20.1.0
runs-on: "ubuntu-latest"
Expand Down
27 changes: 0 additions & 27 deletions .riot/requirements/1017b7b.txt

This file was deleted.

26 changes: 0 additions & 26 deletions .riot/requirements/10192c8.txt

This file was deleted.

27 changes: 12 additions & 15 deletions .riot/requirements/102cf0a.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,29 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/102cf0a.in
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/102cf0a.in
#
attrs==23.1.0
coverage[toml]==7.2.3
exceptiongroup==1.1.1
coverage[toml]==7.2.7
exceptiongroup==1.1.2
gevent==1.4.0
greenlet==0.4.14
gunicorn[gevent]==20.1.0
gunicorn[gevent]==21.2.0
hypothesis==6.45.0
importlib-metadata==6.6.0
importlib-metadata==6.7.0
iniconfig==2.0.0
mock==5.0.2
mock==5.1.0
opentracing==2.4.0
packaging==23.1
pluggy==1.0.0
pluggy==1.2.0
py-cpuinfo==8.0.0
pytest==7.3.1
pytest-asyncio==0.21.0
pytest==7.4.0
pytest-asyncio==0.21.1
pytest-benchmark==4.0.0
pytest-cov==4.0.0
pytest-mock==3.10.0
pytest-cov==4.1.0
pytest-mock==3.11.1
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.7.0
typing-extensions==4.7.1
uwsgi==2.0.21
zipp==3.15.0

# The following packages are considered to be unsafe in a requirements file:
# setuptools
26 changes: 0 additions & 26 deletions .riot/requirements/10516d1.txt

This file was deleted.

40 changes: 0 additions & 40 deletions .riot/requirements/1064743.txt

This file was deleted.

Loading
Loading